diff options
| author | Paolo Bonzini | 2022-03-29 13:07:25 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2022-06-15 11:11:37 +0200 |
| commit | b9eae9efae4ba63af823f3c27d1bd421a4f4f092 (patch) | |
| tree | 9036e25c04960134b6129db53c30c4653d4a4eea | |
| parent | configure: update list of preserved environment variables (diff) | |
| download | qemu-b9eae9efae4ba63af823f3c27d1bd421a4f4f092.tar.gz qemu-b9eae9efae4ba63af823f3c27d1bd421a4f4f092.tar.xz qemu-b9eae9efae4ba63af823f3c27d1bd421a4f4f092.zip | |
configure: cleanup -fno-pie detection
Place it only inside the 'if test "$pie" = "no"' conditional. Since
commit 43924d1e53 ("pc-bios/optionrom: detect -fno-pie", 2022-05-12),
the PIE options are detected independently by pc-bios/optionrom/Makefile,
and the CFLAGS_NOPIE/LDFLAGS_NOPIE variables are not used anymore.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rwxr-xr-x | configure | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -1346,13 +1346,6 @@ static THREAD int tls_var; int main(void) { return tls_var; } EOF -# Check we support -fno-pie and -no-pie first; we will need the former for -# building ROMs, and both for everything if --disable-pie is passed. -if compile_prog "-Werror -fno-pie" "-no-pie"; then - CFLAGS_NOPIE="-fno-pie" - LDFLAGS_NOPIE="-no-pie" -fi - if test "$static" = "yes"; then if test "$pie" != "no" && compile_prog "-Werror -fPIE -DPIE" "-static-pie"; then CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" @@ -1365,8 +1358,10 @@ if test "$static" = "yes"; then pie="no" fi elif test "$pie" = "no"; then - CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS" - CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" + if compile_prog "-Werror -fno-pie" "-no-pie"; then + CONFIGURE_CFLAGS="-fno-pie $CONFIGURE_CFLAGS" + CONFIGURE_LDFLAGS="-no-pie $CONFIGURE_LDFLAGS" + fi elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS" |