re PR libffi/64607 (Multilib test stops working in libffi)

PR libffi/64607

 * Makefile.am (AM_MAKEFLAGS): Use double quotes on subvariables.
 * Makefile.in: Rebuilt.

Co-Authored-By: Richard Henderson <rth@redhat.com>
From-SVN: r219772

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 562e5383b7db628434e49547708d74ea4d12d140..d96b1a55ba37131795a0e35800105abb0f1e3b86 100644 (file)
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-15  Dominique d'Humieres  <dominiq@lps.ens.fr>
+           Richard Henderson  <rth@redhat.com>
+
+       PR libffi/64607
+       * Makefile.am (AM_MAKEFLAGS): Use double quotes on subvariables.
+       * Makefile.in: Rebuilt.
+
 2015-01-15  Richard Henderson  <rth@redhat.com>
 
        PR libffi/64572

diff --git a/libffi/Makefile.am b/libffi/Makefile.am
index 64ff1c1e530159f6dcbe47bc0b15b6fd091b7888..af98000cc549aee0ef6d5c0bdc38ff9bc25ff3af 100644 (file)
--- a/libffi/Makefile.am
+++ b/libffi/Makefile.am
@@ -65,39 +65,39 @@ MAINTAINERCLEANFILES = $(srcdir)/doc/libffi.info
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
 AM_MAKEFLAGS = \
-       'AR_FLAGS=$(AR_FLAGS)' \
-       'CC_FOR_BUILD=$(CC_FOR_BUILD)' \
-       'CFLAGS=$(CFLAGS)' \
-       'CXXFLAGS=$(CXXFLAGS)' \
-       'CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)' \
-       'CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)' \
-       'INSTALL=$(INSTALL)' \
-       'INSTALL_DATA=$(INSTALL_DATA)' \
-       'INSTALL_PROGRAM=$(INSTALL_PROGRAM)' \
-       'INSTALL_SCRIPT=$(INSTALL_SCRIPT)' \
-       'JC1FLAGS=$(JC1FLAGS)' \
-       'LDFLAGS=$(LDFLAGS)' \
-       'LIBCFLAGS=$(LIBCFLAGS)' \
-       'LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)' \
-       'MAKE=$(MAKE)' \
-       'MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)' \
-       'PICFLAG=$(PICFLAG)' \
-       'PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)' \
-       'RUNTESTFLAGS=$(RUNTESTFLAGS)' \
-       'SHELL=$(SHELL)' \
-       'exec_prefix=$(exec_prefix)' \
-       'infodir=$(infodir)' \
-       'libdir=$(libdir)' \
-       'mandir=$(mandir)' \
-       'prefix=$(prefix)' \
-       'AR=$(AR)' \
-       'AS=$(AS)' \
-       'CC=$(CC)' \
-       'CXX=$(CXX)' \
-       'LD=$(LD)' \
-       'NM=$(NM)' \
-       'RANLIB=$(RANLIB)' \
-       'DESTDIR=$(DESTDIR)'
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+       "CFLAGS=$(CFLAGS)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "INSTALL=$(INSTALL)" \
+       "INSTALL_DATA=$(INSTALL_DATA)" \
+       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+       "JC1FLAGS=$(JC1FLAGS)" \
+       "LDFLAGS=$(LDFLAGS)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+       "MAKE=$(MAKE)" \
+       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+       "PICFLAG=$(PICFLAG)" \
+       "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+       "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+       "SHELL=$(SHELL)" \
+       "exec_prefix=$(exec_prefix)" \
+       "infodir=$(infodir)" \
+       "libdir=$(libdir)" \
+       "mandir=$(mandir)" \
+       "prefix=$(prefix)" \
+       "AR=$(AR)" \
+       "AS=$(AS)" \
+       "CC=$(CC)" \
+       "CXX=$(CXX)" \
+       "LD=$(LD)" \
+       "NM=$(NM)" \
+       "RANLIB=$(RANLIB)" \
+       "DESTDIR=$(DESTDIR)"
 
 # Subdir rules rely on $(FLAGS_TO_PASS)
 FLAGS_TO_PASS = $(AM_MAKEFLAGS)

diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index 80ad274cef30590431038db714c129bd4e829d52..1d6a7d106a32be0512548a6d02f938dc67ecf35d 100644 (file)
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -336,39 +336,39 @@ MAINTAINERCLEANFILES = $(srcdir)/doc/libffi.info
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
 AM_MAKEFLAGS = \
-       'AR_FLAGS=$(AR_FLAGS)' \
-       'CC_FOR_BUILD=$(CC_FOR_BUILD)' \
-       'CFLAGS=$(CFLAGS)' \
-       'CXXFLAGS=$(CXXFLAGS)' \
-       'CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)' \
-       'CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)' \
-       'INSTALL=$(INSTALL)' \
-       'INSTALL_DATA=$(INSTALL_DATA)' \
-       'INSTALL_PROGRAM=$(INSTALL_PROGRAM)' \
-       'INSTALL_SCRIPT=$(INSTALL_SCRIPT)' \
-       'JC1FLAGS=$(JC1FLAGS)' \
-       'LDFLAGS=$(LDFLAGS)' \
-       'LIBCFLAGS=$(LIBCFLAGS)' \
-       'LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)' \
-       'MAKE=$(MAKE)' \
-       'MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)' \
-       'PICFLAG=$(PICFLAG)' \
-       'PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)' \
-       'RUNTESTFLAGS=$(RUNTESTFLAGS)' \
-       'SHELL=$(SHELL)' \
-       'exec_prefix=$(exec_prefix)' \
-       'infodir=$(infodir)' \
-       'libdir=$(libdir)' \
-       'mandir=$(mandir)' \
-       'prefix=$(prefix)' \
-       'AR=$(AR)' \
-       'AS=$(AS)' \
-       'CC=$(CC)' \
-       'CXX=$(CXX)' \
-       'LD=$(LD)' \
-       'NM=$(NM)' \
-       'RANLIB=$(RANLIB)' \
-       'DESTDIR=$(DESTDIR)'
+       "AR_FLAGS=$(AR_FLAGS)" \
+       "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+       "CFLAGS=$(CFLAGS)" \
+       "CXXFLAGS=$(CXXFLAGS)" \
+       "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+       "INSTALL=$(INSTALL)" \
+       "INSTALL_DATA=$(INSTALL_DATA)" \
+       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+       "JC1FLAGS=$(JC1FLAGS)" \
+       "LDFLAGS=$(LDFLAGS)" \
+       "LIBCFLAGS=$(LIBCFLAGS)" \
+       "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+       "MAKE=$(MAKE)" \
+       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+       "PICFLAG=$(PICFLAG)" \
+       "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+       "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+       "SHELL=$(SHELL)" \
+       "exec_prefix=$(exec_prefix)" \
+       "infodir=$(infodir)" \
+       "libdir=$(libdir)" \
+       "mandir=$(mandir)" \
+       "prefix=$(prefix)" \
+       "AR=$(AR)" \
+       "AS=$(AS)" \
+       "CC=$(CC)" \
+       "CXX=$(CXX)" \
+       "LD=$(LD)" \
+       "NM=$(NM)" \
+       "RANLIB=$(RANLIB)" \
+       "DESTDIR=$(DESTDIR)"
 
 
 # Subdir rules rely on $(FLAGS_TO_PASS)