Commit 45d285ab authored by Peter Maydell's avatar Peter Maydell Committed by Paolo Bonzini
Browse files

configure: Explicitly set ARFLAGS so we can build with GNU Make 4.0 



Our rules.mak adds '-rR' to MAKEFLAGS to indicate that we will be
explicitly specifying everything and not relying on any default
variables or rules. However we were accidentally relying on the
default ARFLAGS ("rv"). This went unnoticed because of a bug in
GNU Make 3.82 and earlier which meant that adding -rR to MAKEFLAGS
only affected submakes, not the currently running instance.
Explicitly set ARFLAGS in config-host.mak, in the same way we
handle CFLAGS and LDFLAGS; this will allow us to work with
Make 4.0.

Thanks to Paul Smith for analyzing this bug for us.

Cc: qemu-stable@nongnu.org
Reported-by: default avatarKen Moffat <zarniwhoop@ntlworld.com>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent da87dd7b

configure

+5 −0
Original line number Diff line number Diff line
@@ -325,6 +325,9 @@ query_pkg_config() { 
pkg_config=query_pkg_config

sdl_config="${SDL_CONFIG-${cross_prefix}sdl-config}"



# If the user hasn't specified ARFLAGS, default to 'rv', just as make does.

ARFLAGS="${ARFLAGS-rv}"



# default flags for all hosts

QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"

QEMU_CFLAGS="-Wall -Wundef -Wwrite-strings -Wmissing-prototypes $QEMU_CFLAGS"
@@ -3695,6 +3698,7 @@ echo "C compiler $cc" 
echo "Host C compiler   $host_cc"

echo "C++ compiler      $cxx"

echo "Objective-C compiler $objcc"

echo "ARFLAGS           $ARFLAGS"

echo "CFLAGS            $CFLAGS"

echo "QEMU_CFLAGS       $QEMU_CFLAGS"

echo "LDFLAGS           $LDFLAGS"
@@ -4276,6 +4280,7 @@ echo "HOST_CC=$host_cc" >> $config_host_mak 
echo "CXX=$cxx" >> $config_host_mak

echo "OBJCC=$objcc" >> $config_host_mak

echo "AR=$ar" >> $config_host_mak

echo "ARFLAGS=$ARFLAGS" >> $config_host_mak

echo "AS=$as" >> $config_host_mak

echo "CPP=$cpp" >> $config_host_mak

echo "OBJCOPY=$objcopy" >> $config_host_mak