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.

diff --git a/Makefile.def b/Makefile.def
index 3f8962c28032c0706c81456f4854b9ad7a0d3189..b889020afc66c3d5148b9bff337002e3c0ff2bfc 100644 (file)
--- 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 c6313048c914fa7cd4f17eddf4926f993c78a46e..a1f64a2ab5aa3a0333f2c0f5694d478ec0411ca2 100644 (file)
--- 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 6e22adecd2f125835baaa3ec67244d102ea6c646..adbcbdd1d572fceb6ffd2ff34b5d58123ddc4bf1 100644 (file)
--- 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)