summaryrefslogtreecommitdiff
path: root/make
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2013-12-05 10:40:11 +0000
committerAlexey Samsonov <samsonov@google.com>2013-12-05 10:40:11 +0000
commitce31ac1c9afdad67108ffcca27854b70b61aea8c (patch)
treedf2595b6a0a7ae837404431c2e289e1faf6e3259 /make
parent508b24f20fcebe0be3d3b3171edb53309f6b09f9 (diff)
Revert r196490 and fix include paths in makefile-based build
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@196492 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'make')
-rw-r--r--make/config.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/make/config.mk b/make/config.mk
index 6398d058d..2838b6079 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -43,5 +43,7 @@ endif
###
# 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=-fno-exceptions -fPIC -funwind-tables $(COMMON_INCLUDES)
+COMMON_CFLAGS=-fPIC $(COMMON_INCLUDES)
+COMMON_ASMFLAGS=$(COMMON_INCLUDES)