diff options
| author | Tom Tromey <tom@tromey.com> | 2024-01-09 06:25:26 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2024-01-09 08:02:31 -0700 |
| commit | b7e5a29602143b53267efcd9c8d5ecc78cd5a62f (patch) | |
| tree | f23e523f0f128262200cf92df59b98f1c3c61db4 | |
| parent | c9fc7f398e8b330ff12ec8a29bfa058b6daf6624 (diff) | |
| download | gcc-b7e5a29602143b53267efcd9c8d5ecc78cd5a62f.zip gcc-b7e5a29602143b53267efcd9c8d5ecc78cd5a62f.tar.gz gcc-b7e5a29602143b53267efcd9c8d5ecc78cd5a62f.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.
| -rw-r--r-- | Makefile.def | 1 | ||||
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | Makefile.tpl | 7 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Makefile.def b/Makefile.def index 3f8962c..b889020 100644 --- a/Makefile.def +++ b/Makefile.def @@ -312,6 +312,7 @@ flags_to_pass = { flag= GNATBIND ; }; flags_to_pass = { flag= GNATMAKE ; }; flags_to_pass = { flag= GDC ; }; flags_to_pass = { flag= GDCFLAGS ; }; +flags_to_pass = { flag= GUILE ; }; // Target tools flags_to_pass = { flag= AR_FOR_TARGET ; }; diff --git a/Makefile.in b/Makefile.in index c631304..a1f64a2 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. @@ -451,6 +452,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) @@ -883,6 +886,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)" \ diff --git a/Makefile.tpl b/Makefile.tpl index 6e22ade..adbcbdd 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -6,7 +6,7 @@ in # # 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 @@ -146,7 +146,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. @@ -454,6 +455,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) |