commit 2d1fdb26e458c4ddc04155c1d421bced3ba90cd0
author Stephen Hines <srhines@google.com> Wed May 28 23:58:16 2014 -0700
committer Stephen Hines <srhines@google.com> Wed May 28 23:58:16 2014 -0700
tree 346e1f796459c260b140e25df8a68336f9219624
parent 6355b699b2bf305d2ea739b2c48d6286e8db8272

Update compiler-rt aosp/master for 3.5 (r209699) rebase.

Change-Id: I158a30186f0faea2e2400e9dfdd878db2eb40e90

make/config.mk

diff --git a/make/config.mk b/make/config.mk
index 6398d05..094fd16 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -43,5 +43,7 @@
 
 ###
 # Common compiler options
-COMMON_CXXFLAGS=-fno-exceptions -fPIC -funwind-tables -I${ProjSrcRoot}/lib -I${ProjSrcRoot}/include
-COMMON_CFLAGS=-fPIC
+COMMON_INCLUDES=-I${ProjSrcRoot}/lib -I${ProjSrcRoot}/include
+COMMON_CXXFLAGS=-std=c++11 -fno-exceptions -fPIC -funwind-tables $(COMMON_INCLUDES)
+COMMON_CFLAGS=-fPIC $(COMMON_INCLUDES)
+COMMON_ASMFLAGS=$(COMMON_INCLUDES)