summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2011-12-06 21:11:50 +0000
committerKostya Serebryany <kcc@google.com>2011-12-06 21:11:50 +0000
commit4236c97ccd08a22582952fba2e2dd896f6a986d3 (patch)
tree9d543fb968a8371935a3b87aeb7b73a4b209a21f
parentca207f0473dcf0ace13a4320e78912bfa5f77565 (diff)
downloadbcm5719-llvm-4236c97ccd08a22582952fba2e2dd896f6a986d3.tar.gz
bcm5719-llvm-4236c97ccd08a22582952fba2e2dd896f6a986d3.zip
build all C++ files in compiler-rt with -fno-exceptions
llvm-svn: 145967
-rw-r--r--compiler-rt/Makefile2
-rw-r--r--compiler-rt/make/config.mk4
2 files changed, 5 insertions, 1 deletions
diff --git a/compiler-rt/Makefile b/compiler-rt/Makefile
index 92938aa28a0..ef8ee5c0c01 100644
--- a/compiler-rt/Makefile
+++ b/compiler-rt/Makefile
@@ -230,7 +230,7 @@ $(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.c $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir
$(Verb) $(Tmp.CC) $(Tmp.CFLAGS) -c -o $$@ $$<
$(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.cc $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir
$(Summary) " COMPILE: $(Tmp.Name)/$(Tmp.Config)/$(Tmp.Arch): $$<"
- $(Verb) $(Tmp.CC) $(Tmp.CFLAGS) -c -o $$@ $$<
+ $(Verb) $(Tmp.CC) $(Tmp.CFLAGS) -c $(COMMON_CXXFLAGS) -o $$@ $$<
.PRECIOUS: $(Tmp.ObjPath)/.dir
endef
diff --git a/compiler-rt/make/config.mk b/compiler-rt/make/config.mk
index bddc6f8fdcf..5656ad6ca53 100644
--- a/compiler-rt/make/config.mk
+++ b/compiler-rt/make/config.mk
@@ -39,3 +39,7 @@ Echo := @echo
ifndef Summary
Summary = $(Echo)
endif
+
+###
+# Common compiler options
+COMMON_CXXFLAGS=-fno-exceptions
OpenPOWER on IntegriCloud