[Xen-changelog] [qemu-upstream-unstable] configure: Explicitly set ARFLAGS so we can build with GNU Make 4.0

[patchbot@xxxxxxx]

commit c554ddb901f7716e3288a555a0b4fd0cd1f028ab
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Mon Oct 21 21:03:06 2013 +0100
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Tue Dec 3 19:46:18 2013 -0600

    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@xxxxxxxxxx
    Reported-by: Ken Moffat <zarniwhoop@xxxxxxxxxxxx>
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
    (cherry picked from commit 45d285abd7028ac72418c1a22f9298bb898fbfb8)
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 configure |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/configure b/configure
index 1399de2..ff7933b 100755
--- a/configure
+++ b/configure
@@ -298,6 +298,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"
@@ -3529,6 +3532,7 @@ echo "Source path       $source_path"
 echo "C compiler        $cc"
 echo "Host C compiler   $host_cc"
 echo "Objective-C compiler $objcc"
+echo "ARFLAGS           $ARFLAGS"
 echo "CFLAGS            $CFLAGS"
 echo "QEMU_CFLAGS       $QEMU_CFLAGS"
 echo "LDFLAGS           $LDFLAGS"
@@ -4117,6 +4121,7 @@ echo "CC_I386=$cc_i386" >> $config_host_mak
 echo "HOST_CC=$host_cc" >> $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
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog