diff options
| -rw-r--r-- | libffi/ChangeLog | 10 | ||||
| -rw-r--r-- | libffi/Makefile.am | 3 | ||||
| -rw-r--r-- | libffi/Makefile.in | 4 | ||||
| -rwxr-xr-x | libffi/configure | 5 | ||||
| -rw-r--r-- | libffi/configure.ac | 5 | ||||
| -rw-r--r-- | libffi/testsuite/Makefile.am | 2 | ||||
| -rw-r--r-- | libffi/testsuite/Makefile.in | 1 |
7 files changed, 30 insertions, 0 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 47648d31abd..7ad4b70eb00 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,13 @@ +2020-04-25 Maciej W. Rozycki <macro@wdc.com> + + * Makefile.am (DISTCLEANFILES): New variable. + * configure.ac: Produce `local.exp'. + * Makefile.in: Regenerate. + * configure: Regenerate. + * testsuite/Makefile.am (EXTRA_DEJAGNU_SITE_CONFIG): New + variable. + * testsuite/Makefile.in: Regenerate. + 2020-01-24 Maciej W. Rozycki <macro@wdc.com> * configure.ac: Handle `--with-toolexeclibdir='. diff --git a/libffi/Makefile.am b/libffi/Makefile.am index 86e22496152..203b7d10a42 100644 --- a/libffi/Makefile.am +++ b/libffi/Makefile.am @@ -15,6 +15,9 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj \ libffi.xcodeproj/project.pbxproj \ libtool-ldflags +# local.exp is generated by configure +DISTCLEANFILES = local.exp + # Automake Documentation: # If your package has Texinfo files in many directories, you can use the # variable TEXINFO_TEX to tell Automake where to find the canonical diff --git a/libffi/Makefile.in b/libffi/Makefile.in index f7786ff3fd1..745bdd80777 100644 --- a/libffi/Makefile.in +++ b/libffi/Makefile.in @@ -454,6 +454,9 @@ EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj \ libtool-ldflags +# local.exp is generated by configure +DISTCLEANFILES = local.exp + # Automake Documentation: # If your package has Texinfo files in many directories, you can use the # variable TEXINFO_TEX to tell Automake where to find the canonical @@ -1674,6 +1677,7 @@ distclean-generic: -rm -f src/x86/$(am__dirstamp) -rm -f src/xtensa/$(DEPDIR)/$(am__dirstamp) -rm -f src/xtensa/$(am__dirstamp) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/libffi/configure b/libffi/configure index ca0a2965c7a..f0051505d10 100755 --- a/libffi/configure +++ b/libffi/configure @@ -14961,6 +14961,11 @@ _ACEOF +cat > local.exp <<EOF +set CC_FOR_TARGET "$CC" +set CXX_FOR_TARGET "$CXX" +EOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } diff --git a/libffi/configure.ac b/libffi/configure.ac index 93e655803e7..0bf4af410d3 100644 --- a/libffi/configure.ac +++ b/libffi/configure.ac @@ -61,6 +61,11 @@ AC_PROG_LIBTOOL # Test for 64-bit build. AC_CHECK_SIZEOF([size_t]) +cat > local.exp <<EOF +set CC_FOR_TARGET "$CC" +set CXX_FOR_TARGET "$CXX" +EOF + AM_MAINTAINER_MODE AC_CHECK_HEADERS(sys/mman.h) diff --git a/libffi/testsuite/Makefile.am b/libffi/testsuite/Makefile.am index 209e8976635..88509fc35d6 100644 --- a/libffi/testsuite/Makefile.am +++ b/libffi/testsuite/Makefile.am @@ -13,6 +13,8 @@ RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \ AM_RUNTESTFLAGS = +EXTRA_DEJAGNU_SITE_CONFIG=../local.exp + CLEANFILES = *.exe core* *.log *.sum EXTRA_DIST = config/default.exp libffi.call/cls_19byte.c \ diff --git a/libffi/testsuite/Makefile.in b/libffi/testsuite/Makefile.in index 31e9cf520b8..8b574dad5d7 100644 --- a/libffi/testsuite/Makefile.in +++ b/libffi/testsuite/Makefile.in @@ -279,6 +279,7 @@ RUNTEST = `if [ -f $(top_srcdir)/../dejagnu/runtest ] ; then \ echo $(top_srcdir)/../dejagnu/runtest ; \ else echo runtest; fi` +EXTRA_DEJAGNU_SITE_CONFIG = ../local.exp CLEANFILES = *.exe core* *.log *.sum EXTRA_DIST = config/default.exp libffi.call/cls_19byte.c \ libffi.call/cls_align_longdouble_split.c \ |