[llvm-commits] [compiler-rt] r146499 - in /compiler-rt/trunk: Makefile make/config.mk

[Kostya Serebryany]

Author: kcc
Date: Tue Dec 13 12:58:47 2011
New Revision: 146499

URL: http://llvm.org/viewvc/llvm-project?rev=146499&view=rev
Log:
build compiler-rt with -fPIC, otherwise the run-time libs will not link with -pie, at least on linux

Modified:
    compiler-rt/trunk/Makefile
    compiler-rt/trunk/make/config.mk

Modified: compiler-rt/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/Makefile?rev=146499&r1=146498&r2=146499&view=diff
==============================================================================
--- compiler-rt/trunk/Makefile (original)
+++ compiler-rt/trunk/Makefile Tue Dec 13 12:58:47 2011
@@ -227,7 +227,7 @@
 	$(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 $$@ $$<

Modified: compiler-rt/trunk/make/config.mk
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/config.mk?rev=146499&r1=146498&r2=146499&view=diff
==============================================================================
--- compiler-rt/trunk/make/config.mk (original)
+++ compiler-rt/trunk/make/config.mk Tue Dec 13 12:58:47 2011
@@ -42,4 +42,5 @@
 
 ###
 # Common compiler options
-COMMON_CXXFLAGS=-fno-exceptions
+COMMON_CXXFLAGS=-fno-exceptions -fPIC
+COMMON_CFLAGS=-fPIC