diff options
| author | Tom Tromey <tom@tromey.com> | 2023-12-28 14:08:39 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2024-01-09 08:04:56 -0700 |
| commit | d006ec41c448d9f4a84df50391e87cbf0aa8c152 (patch) | |
| tree | 3742e210e827eb4653f54b10472dcefe8ab62390 /Makefile.in | |
| parent | f68c9d09a395ad4bb48661401475ba7f8e8b8a2b (diff) | |
| download | fsf-binutils-gdb-d006ec41c448d9f4a84df50391e87cbf0aa8c152.zip fsf-binutils-gdb-d006ec41c448d9f4a84df50391e87cbf0aa8c152.tar.gz fsf-binutils-gdb-d006ec41c448d9f4a84df50391e87cbf0aa8c152.tar.bz2 | |
Pass GUILE down to subdirectories
When I enable cgen rebuilding in the binutils-gdb tree, the default is
to run cgen using 'guile'. However, on my host, guile is guile 2.2,
which doesn't work for me -- I have to use guile3.0.
This patch arranges to pass "GUILE" down to subdirectories, so I can
use 'make GUILE=guile3.0'.
* Makefile.in: Rebuild.
* Makefile.tpl (BASE_EXPORTS): Add GUILE.
(GUILE): New variable.
* Makefile.def (flags_to_pass): Add GUILE.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 48320bb..9a58d5a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,7 @@ # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2023 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -143,7 +143,8 @@ BASE_EXPORTS = \ M4="$(M4)"; export M4; \ SED="$(SED)"; export SED; \ AWK="$(AWK)"; export AWK; \ - MAKEINFO="$(MAKEINFO)"; export MAKEINFO; + MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \ + GUILE="$(GUILE)"; export GUILE; # This is the list of variables to export in the environment when # configuring subdirectories for the build system. @@ -450,6 +451,8 @@ GM2FLAGS = $(CFLAGS) PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +GUILE = guile + # Pass additional PGO and LTO compiler options to the PGO build. BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) override CFLAGS += $(BUILD_CFLAGS) @@ -878,6 +881,7 @@ BASE_FLAGS_TO_PASS = \ "GNATMAKE=$(GNATMAKE)" \ "GDC=$(GDC)" \ "GDCFLAGS=$(GDCFLAGS)" \ + "GUILE=$(GUILE)" \ "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ "AS_FOR_TARGET=$(AS_FOR_TARGET)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ |