Tom Tromey <t...@tromey.com> writes:
> This reverts commit b7e5a29602143b53267efcd9c8d5ecc78cd5a62f.
>
> This patch caused problems for some users when building gdb, because
> it would cause 'guild' to be invoked with the wrong versin of guile.
> On the whole it seems simpler to just back this out.
>
> * Makefile.in: Rebuild.
> * Makefile.tpl (BASE_EXPORTS): Remove GUILE.
> (GUILE): Remove.
> * Makefile.def (flags_to_pass): Remove GUILE.
Is it going to be possible to merge this with GCC in stage 4? Would be
super useful if we could as this is still causing problems.
Thanks,
Andrew
> ---
> Makefile.def | 1 -
> Makefile.in | 8 ++------
> Makefile.tpl | 7 ++-----
> 3 files changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/Makefile.def b/Makefile.def
> index 19954e7d731..c8c80af3657 100644
> --- a/Makefile.def
> +++ b/Makefile.def
> @@ -312,7 +312,6 @@ 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 edb0c8a9a42..245dd610b53 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, 2023
> +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
> 2011
> # Free Software Foundation
> #
> # This file is free software; you can redistribute it and/or modify
> @@ -143,8 +143,7 @@ BASE_EXPORTS = \
> M4="$(M4)"; export M4; \
> SED="$(SED)"; export SED; \
> AWK="$(AWK)"; export AWK; \
> - MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \
> - GUILE="$(GUILE)"; export GUILE;
> + MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
>
> # This is the list of variables to export in the environment when
> # configuring subdirectories for the build system.
> @@ -452,8 +451,6 @@ 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)
> @@ -886,7 +883,6 @@ 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 adbcbdd1d57..6e22adecd2f 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, 2023
> +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
> 2011
> # Free Software Foundation
> #
> # This file is free software; you can redistribute it and/or modify
> @@ -146,8 +146,7 @@ BASE_EXPORTS = \
> M4="$(M4)"; export M4; \
> SED="$(SED)"; export SED; \
> AWK="$(AWK)"; export AWK; \
> - MAKEINFO="$(MAKEINFO)"; export MAKEINFO; \
> - GUILE="$(GUILE)"; export GUILE;
> + MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
>
> # This is the list of variables to export in the environment when
> # configuring subdirectories for the build system.
> @@ -455,8 +454,6 @@ 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)
> --
> 2.43.0
