Improve test cases as per jistone's comments

This resolves the issues with linking the runtime of asan to dylibs
when it is not required. Additionally, the test cases for sanitizers
are cleaned up by this patch.

Author: Firstyear

src/librustc_metadata/creader.rs

@@ -858,12 +858,12 @@ impl<'a> CrateLoader<'a> {
                 match *ct {
                     // Link the runtime
                     config::CrateTypeExecutable => true,
-                    config::CrateTypeDylib => true,
-                    config::CrateTypeCdylib => true,
-                    config::CrateTypeStaticlib => true,
                     // This crate will be compiled with the required
                     // instrumentation pass
                     config::CrateTypeRlib => false,
+                    config::CrateTypeDylib => false,
+                    config::CrateTypeCdylib => false,
+                    config::CrateTypeStaticlib => false,
                     _ => {
                         self.sess.err(&format!("Only executables, dylibs and rlibs can be \
                                                 compiled with `-Z sanitizer`"));

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

@@ -5,15 +5,22 @@
 # are compiled with address sanitizer, and we assert that a fault in the dylib
 # is correctly detected.
 
-# Note: currently we have to add -lasan to link, because it's not automatically
-# added in the -Z sanitizer=address process.
+# NOTE the address sanitizer only supports x86_64 linux and macOS
 
+ifeq ($(TARGET),x86_64-apple-darwin)
+ASAN_SUPPORT=$(SANITIZER_SUPPORT)
+EXTRA_RUSTFLAG=-C rpath
+else
 ifeq ($(TARGET),x86_64-unknown-linux-gnu)
+ASAN_SUPPORT=$(SANITIZER_SUPPORT)
+EXTRA_RUSTFLAG=
+endif
+endif
+
 all:
-	$(RUSTC) -g -Z sanitizer=address --crate-type dylib --target $(TARGET) -lasan library.rs
-	$(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) -lasan -llibrary program.rs
-	echo $(RUSTC)
+ifeq ($(ASAN_SUPPORT),1)
+	$(RUSTC) -g -Z sanitizer=address --crate-type dylib --target $(TARGET) library.rs
+	$(RUSTC) -g -Z sanitizer=address --crate-type bin --target $(TARGET) -llibrary program.rs
 	LD_LIBRARY_PATH=$(TMPDIR) $(TMPDIR)/program 2>&1 | grep -q stack-buffer-overflow
-else
-all:
 endif
+

src/test/run-make/sanitizer-invalid-cratetype/Makefile

@@ -1,8 +1,18 @@
 -include ../tools.mk
 
+# NOTE the address sanitizer only supports x86_64 linux and macOS
+
+ifeq ($(TARGET),x86_64-apple-darwin)
+ASAN_SUPPORT=$(SANITIZER_SUPPORT)
+EXTRA_RUSTFLAG=-C rpath
+else
 ifeq ($(TARGET),x86_64-unknown-linux-gnu)
+ASAN_SUPPORT=$(SANITIZER_SUPPORT)
+EXTRA_RUSTFLAG=
+endif
+endif
+
 all:
+ifeq ($(ASAN_SUPPORT),1)
 	$(RUSTC) -Z sanitizer=leak --crate-type proc-macro --target $(TARGET) hello.rs 2>&1 | grep -q 'Only executables, dylibs and rlibs can be compiled with `-Z sanitizer`'
-else
-all:
 endif