From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 29 Oct 2018 17:00:23 +0000 (-0700)
Subject: Only pass `-C default-linker-libraries` with sanitizers
X-Git-Tag: tor-0.3.5.4-alpha~33^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82857849662189d25e1a06bf6b764c64d2468168;p=thirdparty%2Ftor.git

Only pass `-C default-linker-libraries` with sanitizers

This'll help retain test compatibility until 1.31.0 is released!
---

diff --git a/configure.ac b/configure.ac
index ef8bb4e351..8f8aa438df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1210,17 +1210,17 @@ dnl variable.
 RUST_LINKER_OPTIONS=""
 if test "x$have_clang" = "xyes"; then
 	if test "x$CFLAGS_ASAN" != "x"; then
-		RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -Clink-arg=$CFLAGS_ASAN"
+		RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -Clink-arg=$CFLAGS_ASAN -Cdefault-linker-libraries"
 	fi
 	if test "x$CFLAGS_UBSAN" != "x"; then
-        	RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -Clink-arg=$CFLAGS_UBSAN"
+        	RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -Clink-arg=$CFLAGS_UBSAN -Cdefault-linker-libraries"
 	fi
 else
 	if test "x$CFLAGS_ASAN" != "x"; then
-		RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -Clink-arg=-fsanitize=address"
+		RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -Clink-arg=-fsanitize=address -Cdefault-linker-libraries"
 	fi
 	if test "x$CFLAGS_UBSAN" != "x"; then
-        	RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -Clink-arg=-fsanitize=undefined"
+        	RUST_LINKER_OPTIONS="$RUST_LINKER_OPTIONS -Clink-arg=-fsanitize=undefined -Cdefault-linker-libraries"
 	fi
 fi
 AC_SUBST(RUST_LINKER_OPTIONS)
diff --git a/src/test/include.am b/src/test/include.am
index 4314581082..ecb7689579 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -12,7 +12,7 @@ TESTS_ENVIRONMENT = \
 	export EXTRA_CARGO_OPTIONS="$(EXTRA_CARGO_OPTIONS)"; \
 	export CARGO_ONLINE="$(CARGO_ONLINE)"; \
 	export CCLD="$(CCLD)"; \
-	export RUSTFLAGS="-C linker=`echo '$(CC)' | cut -d' ' -f 1` $(RUST_LINKER_OPTIONS) -C default-linker-libraries";
+	export RUSTFLAGS="-C linker=`echo '$(CC)' | cut -d' ' -f 1` $(RUST_LINKER_OPTIONS)";
 
 TESTSCRIPTS = \
 	src/test/fuzz_static_testcases.sh \