summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorBen Bridle <bridle.benjamin@gmail.com>2024-10-30 15:49:15 +1300
committerBen Bridle <bridle.benjamin@gmail.com>2024-10-30 16:16:05 +1300
commitec8ed73838d6850c98722bc68b484174b735abfd (patch)
tree240cabb9bb58f412ea111fa3d4d45b783987db41 /src/bin
parent7c98a00cab282a58e9f2adde65bebe431def8481 (diff)
downloadbedrock-pc-ec8ed73838d6850c98722bc68b484174b735abfd.zip
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.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/br.rs8
1 files changed, 7 insertions, 1 deletions
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());
}