mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

build: Fix in-tree cross-compilation build.

Browse source 
Commit 57a889b728 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’.
This commit is contained in:
Ludovic Courtès 2024-07-17 00:00:00 +02:00
parent ad1f56675b
commit c117f8edc4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libguile/Makefile.am
View file

@ -62,15 +62,14 @@ gen_scmconfig_SOURCES = gen-scmconfig.c
## Override default rule; this should be compiled for BUILD host. Note ## 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 ## 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 ## program, but $(top_srcdir)/lib has a gnulib configured for the
## target. Instead we manually add $(top_builddir) and the current ## target. Instead we manually add $(top_builddir) and $(builddir), in
## directory, in order to pick up the generated config.h and ## order to pick up the generated config.h and gen-scmconfig.h. Nothing
## gen-scmconfig.h. Nothing else from Guile is included by this code ## else from Guile is included by this code generator.
## generator.
gen-scmconfig.$(OBJEXT): gen-scmconfig.c gen-scmconfig.$(OBJEXT): gen-scmconfig.c
$(AM_V_GEN) \ $(AM_V_GEN) \
if [ "$(cross_compiling)" = "yes" ]; then \ if [ "$(cross_compiling)" = "yes" ]; then \
$(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) -I$(top_builddir) \ $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) -I$(top_builddir) \
-I. -c -o $@ $<; \ -iquote$(builddir) -c -o $@ $<; \
else \ else \
$(COMPILE) -c -o $@ $<; \ $(COMPILE) -c -o $@ $<; \
fi fi