summaryrefslogtreecommitdiff
path: root/make/platform
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
commitb36103f0fe91a8ca553b6bf67d9f96b91d95d9ee (patch)
tree616f929deb623ddbe20291a081ea895dac1aa9d8 /make/platform
parent8bf8b7943848973398be0c3ad99855e20da6d6fa (diff)
downloadcompiler-rt-b36103f0fe91a8ca553b6bf67d9f96b91d95d9ee.tar.gz
compiler-rt-b36103f0fe91a8ca553b6bf67d9f96b91d95d9ee.tar.bz2
compiler-rt-b36103f0fe91a8ca553b6bf67d9f96b91d95d9ee.tar.xz
Build ASan runtime on Linux for both x86_64 and i386, same as we do with full compiler_rt and libprofile
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@165096 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make/platform')
-rw-r--r--make/platform/clang_linux.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/make/platform/clang_linux.mk b/make/platform/clang_linux.mk
index f2b049f8..fa33ee32 100644
--- a/make/platform/clang_linux.mk
+++ b/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