summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2012-05-22 16:46:05 +0000
committerDmitry Vyukov <dvyukov@google.com>2012-05-22 16:46:05 +0000
commit4d30e9b5ebf2992bbda17354b775f50a4ffd6fbe (patch)
tree8be3ed202ae9b3652555bd555937e477159a0974
parent2b1ff46ed101e4a79946451d7f8815338a93bb5a (diff)
downloadbcm5719-llvm-4d30e9b5ebf2992bbda17354b775f50a4ffd6fbe.tar.gz
bcm5719-llvm-4d30e9b5ebf2992bbda17354b775f50a4ffd6fbe.zip
tsan: fix makefile
allow to build custom configurations llvm-svn: 157259
-rw-r--r--compiler-rt/lib/tsan/rtl/Makefile.old1
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler-rt/lib/tsan/rtl/Makefile.old b/compiler-rt/lib/tsan/rtl/Makefile.old
index 3c715eb6ebd..1041ed8d66b 100644
--- a/compiler-rt/lib/tsan/rtl/Makefile.old
+++ b/compiler-rt/lib/tsan/rtl/Makefile.old
@@ -8,6 +8,7 @@ INCLUDES= -I../..
EXTRA_CXXFLAGS=-fno-exceptions
NO_SYSROOT=--sysroot=.
CXXFLAGS+=$(EXTRA_CXXFLAGS)
+CXXFLAGS+=$(CFLAGS)
ifeq ($(DEBUG), 0)
CXXFLAGS+=-fomit-frame-pointer
ifeq ($(CXX), g++)
OpenPOWER on IntegriCloud