Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
belovdv committed Aug 1, 2022
1 parent 8a842f0 commit efe09c0
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/test/run-make/native-link-modifier-bundle/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ all: $(call NATIVE_STATICLIB,native-staticlib)
# Build a cdylib, `native-staticlib` will appear on the linker line because it was not bundled previously
# The cdylib will contain the `native_func` symbol in the end
$(RUSTC) cdylib-non-bundled.rs --crate-type=cdylib --print link-args | $(CGREP) -e '-l[" ]*native-staticlib'
$(NM) $(call DYLIB,cdylib_non_bundled) | $(CGREP) -e "[Tt] _*native_func"
$(NM) $(call DYLIB,cdylib_non_bundled) | $(CGREP) -e "[Tt] _*native_func"
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
// error-pattern: the linking modifiers `+bundle` and `+whole-archive` are not compatible with each other when generating rlibs

#[link(name = "mylib", kind = "static", modifiers = "+bundle,+whole-archive")]
extern "C" {}
extern "C" { }

fn main() {}
fn main() { }
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ error: the linking modifiers `+bundle` and `+whole-archive` are not compatible w
error: could not find native static library `mylib`, perhaps an -L flag is missing?

error: aborting due to 2 previous errors

Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
// build-fail
// error-pattern: the linking modifiers `+bundle` and `+whole-archive` are not compatible with each other when generating rlibs

fn main() {}
fn main() { }
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ error: the linking modifiers `+bundle` and `+whole-archive` are not compatible w
error: could not find native static library `mylib`, perhaps an -L flag is missing?

error: aborting due to 2 previous errors

0 comments on commit efe09c0

Please sign in to comment.