This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Toplevel patch: Remove EXTRA_TARGET_HOST hackery
- From: Nathanael Nerode <neroden at twcny dot rr dot com>
- To: gcc-patches at gcc dot gnu dot org
- Cc: dj at redhat dot com, binutils at sources dot redhat dot com, gdb-patches at sources dot redhat dot com
- Date: Mon, 18 Nov 2002 08:27:06 -0500
- Subject: Toplevel patch: Remove EXTRA_TARGET_HOST hackery
After my outstanding patches, the EXTRA_TARGET_HOST hackery isn't needed
anymore. The all-libiberty target can be generated
unconditionally, because the "all" target only depends on it when it's
being configured, which is exactly when it used to be added; similarly
with the install-libiberty target.
For 3.4bib, tested, etc.
* Makefile.def: Add host-side libtermcap.
* Makefile.tpl: Remove "EXTRA_TARGET_HOST" hackery.
--- Makefile.tpl.4 2002-11-18 08:19:24.000000000 -0500
+++ Makefile.tpl 2002-11-18 08:21:53.000000000 -0500
@@ -365,13 +365,6 @@
all: all.normal
.PHONY: all
-# These can be overridden by config/mt-*.
-# The _TARGET_ is because they're specified in mt-foo.
-# The _HOST_ is because they're programs that run on the host.
-EXTRA_TARGET_HOST_ALL_MODULES =
-EXTRA_TARGET_HOST_INSTALL_MODULES =
-EXTRA_TARGET_HOST_CHECK_MODULES =
-
#### host and target specific makefile fragments come in here.
###
@@ -544,8 +537,7 @@
# This is a list of the targets for all of the modules which are compiled
# using $(FLAGS_TO_PASS).
ALL_MODULES = [+ FOR host_modules +][+ IF with_x +][+ ELSE with_x +]\
- all-[+module+] [+ ENDIF with_x +][+ ENDFOR host_modules +]\
- $(EXTRA_TARGET_HOST_ALL_MODULES)
+ all-[+module+] [+ ENDIF with_x +][+ ENDFOR host_modules +]
# This is a list of the check targets for all of the modules which are
# compiled using $(FLAGS_TO_PASS).
@@ -561,16 +553,14 @@
check-zip
CROSS_CHECK_MODULES = [+ FOR host_modules +][+ IF no_check +][+ ELIF no_check_cross +][+ ELIF with_x +][+ ELSE check +]\
- check-[+module+] [+ ENDIF no_check +][+ ENDFOR host_modules +]\
- $(EXTRA_TARGET_HOST_CHECK_MODULES)
+ check-[+module+] [+ ENDIF no_check +][+ ENDFOR host_modules +]
CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
# This is a list of the install targets for all of the modules which are
# compiled using $(FLAGS_TO_PASS).
INSTALL_MODULES = [+ FOR host_modules+][+ IF no_install +][+ ELIF with_x +][+ ELSE install +]\
- install-[+module+] [+ ENDIF no_install +][+ ENDFOR host_modules +]\
- $(EXTRA_TARGET_HOST_INSTALL_MODULES)
+ install-[+module+] [+ ENDIF no_install +][+ ENDFOR host_modules +]
# This is a list of the targets for all of the modules which are compiled
# using $(X11_FLAGS_TO_PASS).
--- Makefile.def.3 2002-11-18 07:58:12.000000000 -0500
+++ Makefile.def 2002-11-18 08:21:01.000000000 -0500
@@ -69,7 +69,7 @@
host_modules= { module= tclX; with_x=true; };
host_modules= { module= tk; with_x=true; };
host_modules= { module= tix; with_x=true; };
-
+host_modules= { module= libtermcap; no_check=true; no_clean=true; };
target_modules = { module= libstdc++-v3; };
target_modules = { module= newlib; };
--- Makefile.in.4 2002-11-18 08:19:41.000000000 -0500
+++ Makefile.in 2002-11-18 08:22:34.000000000 -0500
@@ -362,13 +362,6 @@
all: all.normal
.PHONY: all
-# These can be overridden by config/mt-*.
-# The _TARGET_ is because they're specified in mt-foo.
-# The _HOST_ is because they're programs that run on the host.
-EXTRA_TARGET_HOST_ALL_MODULES =
-EXTRA_TARGET_HOST_INSTALL_MODULES =
-EXTRA_TARGET_HOST_CHECK_MODULES =
-
#### host and target specific makefile fragments come in here.
###
@@ -601,7 +594,7 @@
all-wdiff \
all-zip \
all-zlib \
- $(EXTRA_TARGET_HOST_ALL_MODULES)
+ all-libtermcap
# This is a list of the check targets for all of the modules which are
# compiled using $(FLAGS_TO_PASS).
@@ -667,8 +660,7 @@
check-textutils \
check-time \
check-uudecode \
- check-wdiff \
- $(EXTRA_TARGET_HOST_CHECK_MODULES)
+ check-wdiff
CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
@@ -732,7 +724,7 @@
install-uudecode \
install-wdiff \
install-zip \
- $(EXTRA_TARGET_HOST_INSTALL_MODULES)
+ install-libtermcap
# This is a list of the targets for all of the modules which are compiled
# using $(X11_FLAGS_TO_PASS).