aboutsummaryrefslogtreecommitdiff
path: root/libffi
diff options
context:
space:
mode:
authorDominique d'Humieres <dominiq@lps.ens.fr>2015-01-16 21:51:14 +0100
committerRichard Henderson <rth@gcc.gnu.org>2015-01-16 12:51:14 -0800
commit109c4a7c0ab4f2a982a0e7f040d1af1e0294c041 (patch)
treea111ad7168dad59eb9cada34f08287ece074eb5b /libffi
parent6e36114cdf1a41e749e3769ec8181f5c5f965a1e (diff)
downloadgcc-109c4a7c0ab4f2a982a0e7f040d1af1e0294c041.zip
gcc-109c4a7c0ab4f2a982a0e7f040d1af1e0294c041.tar.gz
gcc-109c4a7c0ab4f2a982a0e7f040d1af1e0294c041.tar.bz2
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
Diffstat (limited to 'libffi')
-rw-r--r--libffi/ChangeLog7
-rw-r--r--libffi/Makefile.am66
-rw-r--r--libffi/Makefile.in66
3 files changed, 73 insertions, 66 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 562e538..d96b1a5 100644
--- 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 64ff1c1..af98000 100644
--- 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 80ad274..1d6a7d1 100644
--- 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)