summaryrefslogtreecommitdiff
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
commite235715748826c91f115d11f46d0ff2017d45d2f (patch)
tree91535259ffd93ecedb7caace7182cb0a20b78e70
parentdd8d4981e149fd32b83406fae2dc42216c771f79 (diff)
build all C++ files in compiler-rt with -fno-exceptions
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@145967 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile2
-rw-r--r--make/config.mk4
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 92938aa28..ef8ee5c0c 100644
--- a/Makefile
+++ b/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/make/config.mk b/make/config.mk
index bddc6f8fd..5656ad6ca 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -39,3 +39,7 @@ Echo := @echo
ifndef Summary
Summary = $(Echo)
endif
+
+###
+# Common compiler options
+COMMON_CXXFLAGS=-fno-exceptions