aboutsummaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-10-30 08:45:49 -0400
committerNick Mathewson <nickm@torproject.org>2018-10-30 08:45:49 -0400
commitc19bb4d62e9bf3d969a6950e529a95e2f98b7e1c (patch)
tree3c6dfe52a9b34ec98e5eb68c6300b4fbe99c0002 /src/test/include.am
parented8a853bd8de74e55cd1afbffc1e10c5603751dd (diff)
parentee1cc0feaef6a13f3edf47a42b0c8e5a07603f9c (diff)
downloadtor-c19bb4d62e9bf3d969a6950e529a95e2f98b7e1c.tar.gz
tor-c19bb4d62e9bf3d969a6950e529a95e2f98b7e1c.zip
Merge branch 'maint-0.3.5'
Diffstat (limited to 'src/test/include.am')
-rw-r--r--src/test/include.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/test/include.am b/src/test/include.am
index dd2986c67c..e5eae56e25 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)";
TESTSCRIPTS = \
src/test/fuzz_static_testcases.sh \