Merge branch 'master' of https://github.com/flammit/heads into flammit-master

This commit is contained in:
Trammell Hudson 2017-04-09 17:49:36 -04:00
commit ca06e7598d

View File

@ -493,3 +493,21 @@ index a2ca1c1..df80286 100644
+ }
+}
+
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 4883754..1037fe0 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -502,6 +502,13 @@ set_hostcflags_from_gmp() {
}
build_GMP() {
+ # Check if GCC enables `-pie` by default (possible since GCC 6).
+ # We need PIC in all static libraries then.
+ if "${CC}" -dumpspecs 2>/dev/null | grep -q '[{;][[:space:]]*:-pie\>'
+ then
+ OPTIONS="$OPTIONS --with-pic"
+ fi
+
CC="$CC" ../${GMP_DIR}/configure --disable-shared --enable-fat \
--prefix=$TARGETDIR $OPTIONS \
|| touch .failed