mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: Override the os default with --disable-pie

Browse Source 
Some distributions, e.g. Ubuntu 19.10, enable PIE by default.
If for some reason one wishes to build a non-pie binary, we
must provide additional options to override.

At the same time, reorg the code to an elif chain.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
v3: Update for QEMU_LDFLAGS.
This commit is contained in:
Richard Henderson 2019-12-17 15:15:01 -10:00
parent e6cbd75158
commit 2c674109c2
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
configure vendored
View File

@ -2124,19 +2124,18 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then
LDFLAGS_NOPIE="-no-pie" LDFLAGS_NOPIE="-no-pie"
fi fi
if test "$pie" != "no" ; then if test "$pie" = "no"; then
if compile_prog "-fPIE -DPIE" "-pie"; then QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS" QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS"
QEMU_LDFLAGS="-pie $QEMU_LDFLAGS" elif compile_prog "-fPIE -DPIE" "-pie"; then
pie="yes" QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
else QEMU_LDFLAGS="-pie $QEMU_LDFLAGS"
if test "$pie" = "yes"; then pie="yes"
error_exit "PIE not available due to missing toolchain support" elif test "$pie" = "yes"; then
else error_exit "PIE not available due to missing toolchain support"
echo "Disabling PIE due to missing toolchain support" else
pie="no" echo "Disabling PIE due to missing toolchain support"
fi pie="no"
fi
fi fi
# Detect support for PT_GNU_RELRO + DT_BIND_NOW. # Detect support for PT_GNU_RELRO + DT_BIND_NOW.