Build ASan runtime on Linux for both x86_64 and i386, same as we do with full compile...

llvm-svn: 165096

diff --git a/compiler-rt/make/platform/clang_linux.mk b/compiler-rt/make/platform/clang_linux.mk
index f2b049f..fa33ee3 100644 (file)
--- a/compiler-rt/make/platform/clang_linux.mk
+++ b/compiler-rt/make/platform/clang_linux.mk
@@ -38,12 +38,9 @@ Arch.profile-x86_64 := x86_64
 endif
 
 # Configuration for ASAN runtime.
-ifeq ($(CompilerTargetArch),i386)
-Configs += asan-i386
+ifeq ($(call contains,i386 x86_64,$(CompilerTargetArch)),true)
+Configs += asan-i386 asan-x86_64
 Arch.asan-i386 := i386
-endif
-ifeq ($(CompilerTargetArch),x86_64)
-Configs += asan-x86_64
 Arch.asan-x86_64 := x86_64
 endif