diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-10-01 22:50:08 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-10-01 22:50:08 -0700 |
| commit | 6ebb2c46d5eae7bae8d827fdc68d3ed58b16e95a (patch) | |
| tree | 3cd20abb204b6505894d6d9ab00391ee13c0848a /src/test/include.am | |
| parent | 3dca87e1f98adcdffb962de381d1e5d5410f3d54 (diff) | |
| download | tor-6ebb2c46d5eae7bae8d827fdc68d3ed58b16e95a.tar.gz tor-6ebb2c46d5eae7bae8d827fdc68d3ed58b16e95a.zip | |
Remove the `link_rust.sh.in` script
This is no longer necessary with upstream rust-lang/rust changes as well
as some local tweaks. Namely:
* The `-fsanitize=address`-style options are now passed via `-C
link-args` through `RUSTFLAGS`. This obviates the need for the shell
script.
* The `-C default-linker-libraries`, disabling `-nodefaultlibs`, is
passed through `RUSTFLAGS`, which is necessary to ensure that
`-fsanitize=address` links correctly.
* The `-C linker` option is passed to ensure we're using the same C
compiler as normal C code, although it has a bit of hackery to only
get the `gcc` out of `gcc -std=c99`
Diffstat (limited to 'src/test/include.am')
| -rw-r--r-- | src/test/include.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/include.am b/src/test/include.am index 1055cd0a81..4314581082 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -12,8 +12,7 @@ TESTS_ENVIRONMENT = \ export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \ export CARGO_ONLINE="$(CARGO_ONLINE)"; \ export CCLD="$(CCLD)"; \ - chmod +x "$(abs_top_builddir)/link_rust.sh"; \ - export RUSTFLAGS="-C linker=$(abs_top_builddir)/link_rust.sh"; + export RUSTFLAGS="-C linker=`echo '$(CC)' | cut -d' ' -f 1` $(RUST_LINKER_OPTIONS) -C default-linker-libraries"; TESTSCRIPTS = \ src/test/fuzz_static_testcases.sh \ |