summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2024-07-17 00:00:00 +0200
committerLudovic Courtès <ludo@gnu.org>2024-07-17 00:00:00 +0200
commitc117f8edc471d3362043d88959d73c6a37e7e1e9 (patch)
treee71ba104f4999a6a4e764627918befef6bd589c6
parentad1f56675be58fbb7bfee6fab166ff5bf0b36a11 (diff)
downloadguile-c117f8edc471d3362043d88959d73c6a37e7e1e9.tar.gz
build: Fix in-tree cross-compilation build.
Commit 57a889b7282dab303c4cdc49cccbbe22f961bd1c fixed out-of-tree cross-compilation builds but broke in-tree cross-compilation builds. With this change, we should have both. * libguile/Makefile.am (gen-scmconfig.$(OBJEXT)): Use ‘-iquote’ instead of ‘-I’.
-rw-r--r--libguile/Makefile.am9
1 files changed, 4 insertions, 5 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 8d8fa27d7..ce97abad7 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -62,15 +62,14 @@ gen_scmconfig_SOURCES = gen-scmconfig.c
## Override default rule; this should be compiled for BUILD host. Note
## that we don't add $(AM_CPPFLAGS) here, as we need to run this
## program, but $(top_srcdir)/lib has a gnulib configured for the
-## target. Instead we manually add $(top_builddir) and the current
-## directory, in order to pick up the generated config.h and
-## gen-scmconfig.h. Nothing else from Guile is included by this code
-## generator.
+## target. Instead we manually add $(top_builddir) and $(builddir), in
+## order to pick up the generated config.h and gen-scmconfig.h. Nothing
+## else from Guile is included by this code generator.
gen-scmconfig.$(OBJEXT): gen-scmconfig.c
$(AM_V_GEN) \
if [ "$(cross_compiling)" = "yes" ]; then \
$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) -I$(top_builddir) \
- -I. -c -o $@ $<; \
+ -iquote$(builddir) -c -o $@ $<; \
else \
$(COMPILE) -c -o $@ $<; \
fi