Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-05 15:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Pass GUILE down to subdirectories"

Browse Source 
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.

I'm checking this in to the binutils-gdb repository in the interest of
fixing the build for Andrew.  No one has responded to the identical
patch sent to gcc-patches, but I will ping it there.

	* Makefile.in: Rebuild.
	* Makefile.tpl (BASE_EXPORTS): Remove GUILE.
	(GUILE): Remove.
	* Makefile.def (flags_to_pass): Remove GUILE.
This commit is contained in:
Tom Tromey
2024-03-21 17:12:23 -06:00
parent 7845a24a6d
commit 319719bb29
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.def
View File

@@ -312,7 +312,6 @@ flags_to_pass = { flag= GNATBIND ; };
flags_to_pass = { flag= GNATMAKE ; }; flags_to_pass = { flag= GNATMAKE ; };
flags_to_pass = { flag= GDC ; }; flags_to_pass = { flag= GDC ; };
flags_to_pass = { flag= GDCFLAGS ; }; flags_to_pass = { flag= GDCFLAGS ; };
flags_to_pass = { flag= GUILE ; };
// Target tools // Target tools
flags_to_pass = { flag= AR_FOR_TARGET ; }; flags_to_pass = { flag= AR_FOR_TARGET ; };

8
Makefile.in
View File

@@ -3,7 +3,7 @@
# #
# Makefile for directory with subdirs to build. # Makefile for directory with subdirs to build.
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, # 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 # Free Software Foundation
# #
# This file is free software; you can redistribute it and/or modify # This file is free software; you can redistribute it and/or modify
@@ -143,8 +143,7 @@ BASE_EXPORTS = \
M4="$(M4)"; export M4; \ M4="$(M4)"; export M4; \
SED="$(SED)"; export SED; \ SED="$(SED)"; export SED; \
AWK="$(AWK)"; export AWK; \ 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 # This is the list of variables to export in the environment when
# configuring subdirectories for the build system. # configuring subdirectories for the build system.
@@ -452,8 +451,6 @@ GM2FLAGS = $(CFLAGS)
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
GUILE = guile
# Pass additional PGO and LTO compiler options to the PGO build. # Pass additional PGO and LTO compiler options to the PGO build.
BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS)
override CFLAGS += $(BUILD_CFLAGS) override CFLAGS += $(BUILD_CFLAGS)
@@ -886,7 +883,6 @@ BASE_FLAGS_TO_PASS = \
"GNATMAKE=$(GNATMAKE)" \ "GNATMAKE=$(GNATMAKE)" \
"GDC=$(GDC)" \ "GDC=$(GDC)" \
"GDCFLAGS=$(GDCFLAGS)" \ "GDCFLAGS=$(GDCFLAGS)" \
"GUILE=$(GUILE)" \
"AR_FOR_TARGET=$(AR_FOR_TARGET)" \ "AR_FOR_TARGET=$(AR_FOR_TARGET)" \
"AS_FOR_TARGET=$(AS_FOR_TARGET)" \ "AS_FOR_TARGET=$(AS_FOR_TARGET)" \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \

7
Makefile.tpl
View File

@@ -6,7 +6,7 @@ in
# #
# Makefile for directory with subdirs to build. # Makefile for directory with subdirs to build.
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, # 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 # Free Software Foundation
# #
# This file is free software; you can redistribute it and/or modify # This file is free software; you can redistribute it and/or modify
@@ -146,8 +146,7 @@ BASE_EXPORTS = \
M4="$(M4)"; export M4; \ M4="$(M4)"; export M4; \
SED="$(SED)"; export SED; \ SED="$(SED)"; export SED; \
AWK="$(AWK)"; export AWK; \ 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 # This is the list of variables to export in the environment when
# configuring subdirectories for the build system. # configuring subdirectories for the build system.
@@ -455,8 +454,6 @@ GM2FLAGS = $(CFLAGS)
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
GUILE = guile
# Pass additional PGO and LTO compiler options to the PGO build. # Pass additional PGO and LTO compiler options to the PGO build.
BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS) BUILD_CFLAGS = $(PGO_BUILD_CFLAGS) $(PGO_BUILD_LTO_CFLAGS)
override CFLAGS += $(BUILD_CFLAGS) override CFLAGS += $(BUILD_CFLAGS)