summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2012-10-03 07:16:31 +0000
committerAlexey Samsonov <samsonov@google.com>2012-10-03 07:16:31 +0000
commitc561ce0e0123b8f277f63d231ed9399b1f14e890 (patch)
treecd2240aa5b5ef016ba8eec09490f848301493a11
parent7dfc8be9954776e596bd523c59d9f97fccdd3a35 (diff)
downloadbcm5719-llvm-c561ce0e0123b8f277f63d231ed9399b1f14e890.tar.gz
bcm5719-llvm-c561ce0e0123b8f277f63d231ed9399b1f14e890.zip
Build ASan runtime on Linux for both x86_64 and i386, same as we do with full compiler_rt and libprofile
llvm-svn: 165096
-rw-r--r--compiler-rt/make/platform/clang_linux.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/compiler-rt/make/platform/clang_linux.mk b/compiler-rt/make/platform/clang_linux.mk
index f2b049f8c93..fa33ee3264c 100644
--- 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
OpenPOWER on IntegriCloud