build/test the sanitizers only when --enable-sanitizers is used

4 files changed, 4 insertions, 49 deletions

diff --git a/src/test/run-make/sanitizer-address/Makefile b/src/test/run-make/sanitizer-address/Makefile
index c490f490cdf..5931145f3a4 100644
--- a/src/test/run-make/sanitizer-address/Makefile
+++ b/src/test/run-make/sanitizer-address/Makefile
@@ -1,9 +1,7 @@
 -include ../tools.mk
 
 # NOTE the address sanitizer only supports x86_64 linux
-ifndef IS_WINDOWS
-ifeq ($(shell uname),Linux)
-ifeq ($(shell uname -m),x86_64)
+ifdef SANITIZER_SUPPORT
 all:
 	$(RUSTC) -g -Z sanitizer=address -Z print-link-args overflow.rs | grep -q librustc_asan
 	$(TMPDIR)/overflow 2>&1 | grep -q stack-buffer-overflow
@@ -11,11 +9,3 @@ else
 all:
 
 endif
-else
-all:
-
-endif
-else
-all:
-
-endif
diff --git a/src/test/run-make/sanitizer-leak/Makefile b/src/test/run-make/sanitizer-leak/Makefile
index 492e328fab2..f02d948fdc8 100644
--- a/src/test/run-make/sanitizer-leak/Makefile
+++ b/src/test/run-make/sanitizer-leak/Makefile
@@ -1,11 +1,6 @@
 -include ../tools.mk
 
-# NOTE the leak sanitizer only supports x86_64 linux
-# Also, this particular sanitizer sometimes doesn't work so we are not going to
-# run the binary
-ifndef IS_WINDOWS
-ifeq ($(shell uname),Linux)
-ifeq ($(shell uname -m),x86_64)
+ifdef SANITIZER_SUPPORT
 all:
 	$(RUSTC) -C opt-level=1 -g -Z sanitizer=leak -Z print-link-args leak.rs | grep -q librustc_lsan
 	$(TMPDIR)/leak 2>&1 | grep -q 'detected memory leaks'
@@ -13,11 +8,3 @@ else
 all:
 
 endif
-else
-all:
-
-endif
-else
-all:
-
-endif
diff --git a/src/test/run-make/sanitizer-memory/Makefile b/src/test/run-make/sanitizer-memory/Makefile
index f8960992a0d..08682e5975e 100644
--- a/src/test/run-make/sanitizer-memory/Makefile
+++ b/src/test/run-make/sanitizer-memory/Makefile
@@ -1,9 +1,6 @@
 -include ../tools.mk
 
-# NOTE the memory sanitizer only supports x86_64 linux
-ifndef IS_WINDOWS
-ifeq ($(shell uname),Linux)
-ifeq ($(shell uname -m),x86_64)
+ifdef SANITIZER_SUPPORT
 all:
 	$(RUSTC) -g -Z sanitizer=memory -Z print-link-args uninit.rs | grep -q librustc_msan
 	$(TMPDIR)/uninit 2>&1 | grep -q use-of-uninitialized-value
@@ -11,11 +8,3 @@ else
 all:
 
 endif
-else
-all:
-
-endif
-else
-all:
-
-endif
diff --git a/src/test/run-make/sanitizer-thread/Makefile b/src/test/run-make/sanitizer-thread/Makefile
index e32247c4a9b..8bb89a241cb 100644
--- a/src/test/run-make/sanitizer-thread/Makefile
+++ b/src/test/run-make/sanitizer-thread/Makefile
@@ -1,9 +1,6 @@
 -include ../tools.mk
 
-# NOTE the leak sanitizer only supports x86_64 linux
-ifndef IS_WINDOWS
-ifeq ($(shell uname),Linux)
-ifeq ($(shell uname -m),x86_64)
+ifdef SANITIZER_SUPPORT
 all:
 	$(RUSTC) -g -Z sanitizer=thread -Z print-link-args racy.rs | grep -q librustc_tsan
 	$(TMPDIR)/racy 2>&1 | grep -q 'data race'
@@ -11,11 +8,3 @@ else
 all:
 
 endif
-else
-all:
-
-endif
-else
-all:
-
-endif