diff -Nurd guile-2.2.7.orig/configure guile-2.2.7/configure --- guile-2.2.7.orig/configure 2020-03-07 13:04:10.000000000 -0500 +++ guile-2.2.7/configure 2022-11-22 03:31:24.000000000 -0500 @@ -53819,6 +53819,7 @@ fi save_LIBS="$LIBS" +save_CFLAGS="$CFLAGS" LIBS="$BDW_GC_LIBS $LIBS" CFLAGS="$BDW_GC_CFLAGS $CFLAGS" @@ -53851,6 +53852,7 @@ LIBS="$save_LIBS" +CFLAGS="$save_CFLAGS" # The cast to long int works around a bug in the HP C Compiler @@ -55688,7 +55690,6 @@ top_srcdir_absolute=`(cd $srcdir && pwd)` -CPPFLAGS="-I$top_srcdir_absolute $CPPFLAGS" pkgdatadir="$datadir/$PACKAGE_TARNAME" sitedir="$pkgdatadir/site/$GUILE_EFFECTIVE_VERSION" diff -Nurd guile-2.2.7.orig/lib/Makefile.in guile-2.2.7/lib/Makefile.in --- guile-2.2.7.orig/lib/Makefile.in 2020-02-12 04:36:54.000000000 -0500 +++ guile-2.2.7/lib/Makefile.in 2022-11-22 04:34:09.000000000 -0500 @@ -1864,7 +1864,7 @@ DISTCLEANFILES = MAINTAINERCLEANFILES = iconv_open-aix.h iconv_open-hpux.h \ iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h -AM_CPPFLAGS = +AM_CPPFLAGS = -I$(top_srcdir) # The value of $(CFLAG_VISIBILITY) needs to be added to the CFLAGS for the # compilation of all sources that make up the library. This line here does it diff -Nurd guile-2.2.7.orig/libguile/Makefile.in guile-2.2.7/libguile/Makefile.in --- guile-2.2.7.orig/libguile/Makefile.in 2020-02-12 04:36:54.000000000 -0500 +++ guile-2.2.7/libguile/Makefile.in 2022-11-22 02:48:40.000000000 -0500 @@ -1896,7 +1896,7 @@ # is picked up by instead of the libc's . DEFAULT_INCLUDES = AM_CPPFLAGS = -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib $(LIBFFI_CFLAGS) + -I$(top_srcdir)/lib -I$(top_builddir)/lib $(BDW_GC_CFLAGS) $(LIBFFI_CFLAGS) AM_CFLAGS = $(GCC_CFLAGS) $(CFLAG_VISIBILITY) gnulib_library = $(top_builddir)/lib/libgnu.la diff -Nurd guile-2.2.7.orig/test-suite/standalone/Makefile.in guile-2.2.7/test-suite/standalone/Makefile.in --- guile-2.2.7.orig/test-suite/standalone/Makefile.in 2020-02-12 04:36:54.000000000 -0500 +++ guile-2.2.7/test-suite/standalone/Makefile.in 2022-11-22 04:24:41.000000000 -0500 @@ -1953,13 +1953,12 @@ GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/build-env" AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \ - -I$(top_srcdir)/lib -I$(top_builddir)/lib + -I$(top_srcdir)/lib -I$(top_builddir)/lib \ + -I$(top_srcdir)/test-suite/standalone test_cflags = \ - -I$(top_srcdir)/test-suite/standalone -I. \ $(EXTRA_DEFS) $(GUILE_CFLAGS) $(GCC_CFLAGS) -AM_LDFLAGS = $(GUILE_CFLAGS) # How to link with libguile (same as `Libs' in `guile-2.0.pc'.) LIBGUILE_LDADD = \