[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 6/7] configure: Override the os default with --disable-pie
From: |
Thomas Huth |
Subject: |
Re: [PATCH 6/7] configure: Override the os default with --disable-pie |
Date: |
Wed, 18 Dec 2019 09:13:35 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 |
On 18/12/2019 04.19, Richard Henderson wrote:
> 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.
>
> Signed-off-by: Richard Henderson <address@hidden>
> ---
> configure | 25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/configure b/configure
> index f8981eec15..1645a58b3a 100755
> --- a/configure
> +++ b/configure
> @@ -2029,19 +2029,18 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then
> LDFLAGS_NOPIE="-no-pie"
> fi
>
> -if test "$pie" != "no" ; then
> - if compile_prog "-fPIE -DPIE" "-pie"; then
> - QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
> - LDFLAGS="-pie $LDFLAGS"
> - pie="yes"
> - else
> - if test "$pie" = "yes"; then
> - error_exit "PIE not available due to missing toolchain support"
> - else
> - echo "Disabling PIE due to missing toolchain support"
> - pie="no"
> - fi
> - fi
> +if test "$pie" = "no"; then
> + QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
> + LDFLAGS="$LDFLAGS_NOPIE $LDFLAGS"
> +elif compile_prog "-fPIE -DPIE" "-pie"; then
> + QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
> + LDFLAGS="-pie $LDFLAGS"
> + pie="yes"
> +elif test "$pie" = "yes"; then
> + error_exit "PIE not available due to missing toolchain support"
> +else
> + echo "Disabling PIE due to missing toolchain support"
> + pie="no"
> fi
>
> # Detect support for DT_BIND_NOW.
>
Reviewed-by: Thomas Huth <address@hidden>