summaryrefslogtreecommitdiff
path: root/make/platform
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2012-11-16 12:51:23 +0000
committerAlexey Samsonov <samsonov@google.com>2012-11-16 12:51:23 +0000
commit94a04b1590ea7c096b2fd1d5eab06759b566712c (patch)
treef08a93a9d9d0111caf07a3607abb6b54d68d457b /make/platform
parent16da7947df767cf75874430d4ecfeeee218339bd (diff)
downloadcompiler-rt-94a04b1590ea7c096b2fd1d5eab06759b566712c.tar.gz
compiler-rt-94a04b1590ea7c096b2fd1d5eab06759b566712c.tar.bz2
compiler-rt-94a04b1590ea7c096b2fd1d5eab06759b566712c.tar.xz
UBSan: fix support on Darwin in 'make' build system. Patch by Jean-Daniel Dupas.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@168167 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make/platform')
-rw-r--r--make/platform/clang_darwin.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk
index 399edee0..fe84a056 100644
--- a/make/platform/clang_darwin.mk
+++ b/make/platform/clang_darwin.mk
@@ -134,7 +134,7 @@ CFLAGS.asan_osx_dynamic := \
$(CFLAGS) -mmacosx-version-min=10.5 -fno-builtin \
-DMAC_INTERPOSE_FUNCTIONS=1
-CFLAGS.ubsan_osx := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
+CFLAGS.ubsan_osx := $(CFLAGS) -mmacosx-version-min=10.5 -fno-builtin
CFLAGS.ios.i386 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
CFLAGS.ios.x86_64 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
@@ -188,7 +188,7 @@ FUNCTIONS.asan_osx_dynamic := $(AsanFunctions) $(InterceptionFunctions) \
$(SanitizerCommonFunctions) \
$(AsanDynamicFunctions)
-FUNCTIONS.ubsan_osx := $(UbsanFunctions)
+FUNCTIONS.ubsan_osx := $(UbsanFunctions) $(SanitizerCommonFunctions)
CCKEXT_COMMON_FUNCTIONS := \
absvdi2 \