Message ID | 20200403191150.863-13-alex.bennee@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | a selection of random fixes | expand |
On 4/3/20 9:11 PM, Alex Bennée wrote: > From: Richard Henderson <richard.henderson@linaro.org> > > Without -Werror, the probe may succeed, but then compilation fails > later when -Werror is added for other reasons. Shows up on windows, > where the compiler complains about -fPIC. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Message-Id: <20200401214756.6559-1-richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > configure | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 22870f38672..233c671aaa9 100755 > --- a/configure > +++ b/configure > @@ -2119,7 +2119,7 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then > fi > > if test "$static" = "yes"; then > - if test "$pie" != "no" && compile_prog "-fPIE -DPIE" "-static-pie"; then > + if test "$pie" != "no" && compile_prog "-Werror -fPIE -DPIE" "-static-pie"; then > QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS" > QEMU_LDFLAGS="-static-pie $QEMU_LDFLAGS" > pie="yes" > @@ -2132,7 +2132,7 @@ if test "$static" = "yes"; then > elif test "$pie" = "no"; then > QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS" > QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS" > -elif compile_prog "-fPIE -DPIE" "-pie"; then > +elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then > QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS" > QEMU_LDFLAGS="-pie $QEMU_LDFLAGS" > pie="yes" >
diff --git a/configure b/configure index 22870f38672..233c671aaa9 100755 --- a/configure +++ b/configure @@ -2119,7 +2119,7 @@ if compile_prog "-Werror -fno-pie" "-no-pie"; then fi if test "$static" = "yes"; then - if test "$pie" != "no" && compile_prog "-fPIE -DPIE" "-static-pie"; then + if test "$pie" != "no" && compile_prog "-Werror -fPIE -DPIE" "-static-pie"; then QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS" QEMU_LDFLAGS="-static-pie $QEMU_LDFLAGS" pie="yes" @@ -2132,7 +2132,7 @@ if test "$static" = "yes"; then elif test "$pie" = "no"; then QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS" QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS" -elif compile_prog "-fPIE -DPIE" "-pie"; then +elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS" QEMU_LDFLAGS="-pie $QEMU_LDFLAGS" pie="yes"