From ec8ed73838d6850c98722bc68b484174b735abfd Mon Sep 17 00:00:00 2001
From: Ben Bridle <bridle.benjamin@gmail.com>
Date: Wed, 30 Oct 2024 15:49:15 +1300
Subject: Update source merging strategy

This updates the bedrock-asm dependency so that we can use the new
source merging strategy added in version 4.0.2.
---
 src/bin/br.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/bin')

diff --git a/src/bin/br.rs b/src/bin/br.rs
index ed101de..d9d792f 100644
--- a/src/bin/br.rs
+++ b/src/bin/br.rs
@@ -265,7 +265,13 @@ fn main_asm(args: Asm) {
     if print_resolver_errors(&resolver) {
         std::process::exit(1);
     };
-    let merged_source = resolver.get_merged_source_code();
+    let merged_source = match resolver.get_merged_source_code() {
+        Ok(merged_source) => merged_source,
+        Err(ids) => {
+            print_cyclic_source_units(&ids, &resolver);
+            std::process::exit(1);
+        },
+    };
     if args.resolve && !args.check {
         write_bytes_and_exit(merged_source.as_bytes(), args.output.as_ref());
     }
-- 
cgit v1.2.3-70-g09d2