diff options
| author | Alexey Samsonov <samsonov@google.com> | 2014-03-19 15:26:54 +0000 |
|---|---|---|
| committer | Alexey Samsonov <samsonov@google.com> | 2014-03-19 15:26:54 +0000 |
| commit | aa3dc60bffe23259164befc105a1fcfa9b5559cb (patch) | |
| tree | 67f4da35bdf47c052d0d6ed177be3efb94f4f548 /make/platform | |
| parent | 57bacc08aa69f83c9b9d2c7161a35a41e565192e (diff) | |
One more attempt to fix Makefile build
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@204241 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make/platform')
| -rw-r--r-- | make/platform/clang_darwin.mk | 5 | ||||
| -rw-r--r-- | make/platform/clang_linux.mk | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/make/platform/clang_darwin.mk b/make/platform/clang_darwin.mk index dc8417908..80e6a19fe 100644 --- a/make/platform/clang_darwin.mk +++ b/make/platform/clang_darwin.mk @@ -159,7 +159,6 @@ CFLAGS.10.4 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS) CFLAGS.asan_osx_dynamic := \ $(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin \ -gline-tables-only \ - -std=c++11 \ -DMAC_INTERPOSE_FUNCTIONS=1 CFLAGS.asan_iossim_dynamic := \ @@ -167,11 +166,9 @@ CFLAGS.asan_iossim_dynamic := \ -isysroot $(IOSSIM_SDK_PATH) \ -fno-builtin \ -gline-tables-only \ - -std=c++11 \ -DMAC_INTERPOSE_FUNCTIONS=1 -CFLAGS.ubsan_osx := $(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin \ - -std=c++11 +CFLAGS.ubsan_osx := $(CFLAGS) -mmacosx-version-min=10.6 -fno-builtin CFLAGS.ios.i386 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS) CFLAGS.ios.x86_64 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS) diff --git a/make/platform/clang_linux.mk b/make/platform/clang_linux.mk index 567ea5d01..c6921ea04 100644 --- a/make/platform/clang_linux.mk +++ b/make/platform/clang_linux.mk @@ -86,7 +86,7 @@ endif ### CFLAGS := -Wall -Werror -O3 -fomit-frame-pointer -SANITIZER_CFLAGS := -std=c++11 -fPIE -fno-builtin -gline-tables-only +SANITIZER_CFLAGS := -fPIE -fno-builtin -gline-tables-only CFLAGS.full-i386 := $(CFLAGS) -m32 CFLAGS.full-x86_64 := $(CFLAGS) -m64 @@ -109,7 +109,7 @@ SHARED_LIBRARY.asan-arm-android := 1 ANDROID_COMMON_FLAGS := -target arm-linux-androideabi \ --sysroot=$(LLVM_ANDROID_TOOLCHAIN_DIR)/sysroot \ -B$(LLVM_ANDROID_TOOLCHAIN_DIR) -CFLAGS.asan-arm-android := $(CFLAGS) -fPIC -fno-builtin \ +CFLAGS.asan-arm-android := $(CFLAGS) $(SANITIZER_CFLAGS) \ $(ANDROID_COMMON_FLAGS) -fno-rtti \ -I$(ProjSrcRoot)/android/include LDFLAGS.asan-arm-android := $(LDFLAGS) $(ANDROID_COMMON_FLAGS) -ldl -lm -llog \ |