summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2011-12-13 18:58:47 +0000
committerKostya Serebryany <kcc@google.com>2011-12-13 18:58:47 +0000
commit803c124c0ab2525b5ab9dcadb110afc60250407b (patch)
tree58ebaf0fb1dfdeeda8c445b6dc6f2a59c7caa9e9
parent332bfbf29cd49352f808d7be0807b46134e4a4a4 (diff)
build compiler-rt with -fPIC, otherwise the run-time libs will not link with -pie, at least on linux
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@146499 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--Makefile2
-rw-r--r--make/config.mk3
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ef8ee5c0c..642b65432 100644
--- a/Makefile
+++ b/Makefile
@@ -227,7 +227,7 @@ $(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.S $(Tmp.Dependencies) $(Tmp.ObjPath)/.dir
$(Verb) $(Tmp.CC) $(Tmp.CFLAGS) -c -o $$@ $$<
$(Tmp.ObjPath)/%.o: $(Tmp.SrcPath)/%.c $(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_CFLAGS) -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 $(COMMON_CXXFLAGS) -o $$@ $$<
diff --git a/make/config.mk b/make/config.mk
index 5656ad6ca..df7c1ccfe 100644
--- a/make/config.mk
+++ b/make/config.mk
@@ -42,4 +42,5 @@ endif
###
# Common compiler options
-COMMON_CXXFLAGS=-fno-exceptions
+COMMON_CXXFLAGS=-fno-exceptions -fPIC
+COMMON_CFLAGS=-fPIC