summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2017-10-29 23:21:25 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2017-10-29 23:21:25 +0000
commitb98b560ad3092f32e8a1e76090799ad843ff38f0 (patch)
tree578fdd1110f50e5b7d00bfa6d48e8c4c16e97500
parent4d80d489d4c3f1c8ecbfe73ad73a63b74ad56ad9 (diff)
downloads6-rc-b98b560ad3092f32e8a1e76090799ad843ff38f0.tar.xz
Support default pie
-rwxr-xr-xconfigure15
-rwxr-xr-xtools/gen-deps.sh4
2 files changed, 19 insertions, 0 deletions
diff --git a/configure b/configure
index b1c279f..65166e1 100755
--- a/configure
+++ b/configure
@@ -295,6 +295,16 @@ if [ "x$target" != "x$(cat $sysdeps/target)" ] ; then
exit 1
fi
+defaultpie=false
+echo "Checking whether we're building PIE..."
+if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -dM -E - < /dev/null | grep -qF __PIE__ ; then
+ defaultpie=true
+ CFLAGS_AUTO="$CFLAGS_AUTO -fPIC"
+ echo " ... yes"
+else
+ echo " ... no"
+fi
+
spawn_lib=$(cat $sysdeps/spawn.lib)
socket_lib=$(cat $sysdeps/socket.lib)
sysclock_lib=$(cat $sysdeps/sysclock.lib)
@@ -407,6 +417,11 @@ if $shared ; then
else
echo "DO_SHARED :="
fi
+if $defaultpie ; then
+ echo "DEFAULT_PIE := 1"
+else
+ echo "DEFAULT_PIE :="
+fi
exec 1>&3 3>&-
echo " ... done."
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index 5c96dd1..67ec2d4 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -65,7 +65,11 @@ for dir in $(ls -1 src | grep -v ^include) ; do
deps="$deps src/$dir/$dep"
fi
done < src/$dir/deps-lib/$file
+ echo 'ifeq ($(strip $(DEFAULT_PIE)),)'
echo "lib${file}.a.xyzzy:$deps"
+ echo else
+ echo "lib${file}.a.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
+ echo endif
echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs"
echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')"
done