Skip to content

Commit 45fbe8f

Browse files
committed
tests: Remove unnecessary -C relocation-model=dynamic-no-pics
The referenced `sanitizer-address/Makefile` no longer exists, so perhaps these options are no longer necessary as well. Even if they are still necessary, they should use `-C relocation-model=static` instead.
1 parent a4199b4 commit 45fbe8f

File tree

2 files changed

+4
-10
lines changed
  • src/test/run-make-fulldeps

2 files changed

+4
-10
lines changed

src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ LOG := $(TMPDIR)/log.txt
1111
# are compiled with address sanitizer, and we assert that a fault in the cdylib
1212
# is correctly detected.
1313

14-
# See comment in sanitizer-address/Makefile for why this is here
15-
EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic
16-
1714
all:
18-
$(RUSTC) -g -Z sanitizer=address --crate-type cdylib --target $(TARGET) $(EXTRA_RUSTFLAG) library.rs
19-
$(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) $(EXTRA_RUSTFLAG) -llibrary program.rs
15+
$(RUSTC) -g -Z sanitizer=address --crate-type cdylib --target $(TARGET) library.rs
16+
$(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) -llibrary program.rs
2017
LD_LIBRARY_PATH=$(TMPDIR) $(TMPDIR)/program 2>&1 | $(CGREP) stack-buffer-overflow

src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ LOG := $(TMPDIR)/log.txt
1111
# are compiled with address sanitizer, and we assert that a fault in the dylib
1212
# is correctly detected.
1313

14-
# See comment in sanitizer-address/Makefile for why this is here
15-
EXTRA_RUSTFLAG=-C relocation-model=dynamic-no-pic
16-
1714
all:
18-
$(RUSTC) -g -Z sanitizer=address --crate-type dylib --target $(TARGET) $(EXTRA_RUSTFLAG) library.rs
19-
$(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) $(EXTRA_RUSTFLAG) -llibrary program.rs
15+
$(RUSTC) -g -Z sanitizer=address --crate-type dylib --target $(TARGET) library.rs
16+
$(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) -llibrary program.rs
2017
LD_LIBRARY_PATH=$(TMPDIR) $(TMPDIR)/program 2>&1 | $(CGREP) stack-buffer-overflow

0 commit comments

Comments
 (0)