[compiler-rt] r204241 - One more attempt to fix Makefile build

[Alexey Samsonov]

Author: samsonov
Date: Wed Mar 19 10:26:54 2014
New Revision: 204241

URL: http://llvm.org/viewvc/llvm-project?rev=204241&view=rev
Log:
One more attempt to fix Makefile build

Modified:
    compiler-rt/trunk/make/config.mk
    compiler-rt/trunk/make/platform/clang_darwin.mk
    compiler-rt/trunk/make/platform/clang_linux.mk

Modified: compiler-rt/trunk/make/config.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/config.mk?rev=204241&r1=204240&r2=204241&view=diff
==============================================================================
--- compiler-rt/trunk/make/config.mk (original)
+++ compiler-rt/trunk/make/config.mk Wed Mar 19 10:26:54 2014
@@ -44,6 +44,6 @@ endif
 ###
 # Common compiler options
 COMMON_INCLUDES=-I${ProjSrcRoot}/lib -I${ProjSrcRoot}/include
-COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables $(COMMON_INCLUDES)
+COMMON_CXXFLAGS=-std=c++11 -fno-exceptions -fPIC -funwind-tables $(COMMON_INCLUDES)
 COMMON_CFLAGS=-fPIC $(COMMON_INCLUDES)
 COMMON_ASMFLAGS=$(COMMON_INCLUDES)

Modified: compiler-rt/trunk/make/platform/clang_darwin.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_darwin.mk?rev=204241&r1=204240&r2=204241&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_darwin.mk (original)
+++ compiler-rt/trunk/make/platform/clang_darwin.mk Wed Mar 19 10:26:54 2014
@@ -159,7 +159,6 @@ CFLAGS.10.4		:= $(CFLAGS) $(OSX_DEPLOYME
 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)

Modified: compiler-rt/trunk/make/platform/clang_linux.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_linux.mk?rev=204241&r1=204240&r2=204241&view=diff
==============================================================================
--- compiler-rt/trunk/make/platform/clang_linux.mk (original)
+++ compiler-rt/trunk/make/platform/clang_linux.mk Wed Mar 19 10:26:54 2014
@@ -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 \