xbps-src: pass PIE flags via -specs mechanism, avoids breaking static build.

2015-03-07 20:52:28 +01:00 · 2015-03-07 20:52:28 +01:00 · ea96fc3cce
parent 494316a961
commit ea96fc3cce
3 changed files with 11 additions and 2 deletions
--- a/common/environment/configure/build-pie.sh
+++ b/common/environment/configure/build-pie.sh
@ -1,4 +1,6 @@
+_GCCSPECSDIR=${XBPS_COMMONDIR}/environment/configure/gccspecs
+
 if [ -n "$build_pie" ]; then
-	CFLAGS+=" -fPIE"
-	LDFLAGS+=" -pie"
+	CFLAGS+=" -specs=$_GCCSPECSDIR/hardened-cc1"
+	LDFLAGS+=" -specs=$_GCCSPECSDIR/hardened-ld"
 fi
--- a/common/environment/configure/gccspecs/hardened-cc1
+++ b/common/environment/configure/gccspecs/hardened-cc1
@ -0,0 +1,2 @@
+*cc1_options:
+ %{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}
--- a/common/environment/configure/gccspecs/hardened-ld
+++ b/common/environment/configure/gccspecs/hardened-ld
@ -0,0 +1,5 @@
+*self_spec:
+ %{static|Bstatic|shared|Bshareable|i|r|pie|nopie:;:-pie}
+
+*link:
+ %{!static:-z relro}