2002-12-02 Nathanael Nerode <neroden@gcc.gnu.org>
(finishing slow-motion replay) * configure: Remove skip-this-dir support. * Makefile.tpl: Remove skip-this-dir support. * Makefile.tpl: Remove leftover support for non-autoconfiscated subdirectories. * Makefile.in: Regenerate. * Makefile.tpl: Strip out useless setting of 'dir'. * Makefile.in: Regenerate. 2002-12-02 Nathanael Nerode <neroden@gcc.gnu.org> (finishing slow-motion replay) * configure.in: Fix deeply stupid bug. * configure.in: Introduce RAW_CXX_FOR_TARGET and simplify embedded shell code in CXX_FOR_TARGET * Makefile.def: Introduce raw_cxx. * Makefile.tpl: Use raw_cxx to select between CXX_FOR_TARGET and RAW_CXX_FOR_TARGET. * Makefile.in: Regenerate. 2002-12-02 Nathanael Nerode <neroden@gcc.gnu.org> (finishing slow-motion replay) * Makefile.tpl: Remove unnecessary ifs. * Makefile.in: Regenerate. * Makefile.tpl: Implement soft dependency machinery. Maybe-ize dependencies. Maybe-ize build-libiberty. Create dummy install targets for 'no_install' modules. * configure: Move GDB_TK substitution to configure.in. Move build_modules stuff to configure.in. * configure.in: Implement soft dependency machinery. Maybe-ize GDB_TK, rearrange slightly. Move build_modules stuff from configure. * Makefile.in: Regenerate.
This commit is contained in:
Nathanael Nerode
parent
8d49f1c93e
commit
c5e4bb704d
40
ChangeLog
40
ChangeLog
|
|
@ -1,3 +1,43 @@
|
|||
2002-12-02 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
(finishing slow-motion replay)
|
||||
* configure: Remove skip-this-dir support.
|
||||
* Makefile.tpl: Remove skip-this-dir support.
|
||||
|
||||
* Makefile.tpl: Remove leftover support for non-autoconfiscated
|
||||
subdirectories.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
* Makefile.tpl: Strip out useless setting of 'dir'.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2002-12-02 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
(finishing slow-motion replay)
|
||||
* configure.in: Fix deeply stupid bug.
|
||||
|
||||
* configure.in: Introduce RAW_CXX_FOR_TARGET and simplify embedded
|
||||
shell code in CXX_FOR_TARGET
|
||||
* Makefile.def: Introduce raw_cxx.
|
||||
* Makefile.tpl: Use raw_cxx to select between CXX_FOR_TARGET and
|
||||
RAW_CXX_FOR_TARGET.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2002-12-02 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
(finishing slow-motion replay)
|
||||
* Makefile.tpl: Remove unnecessary ifs.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
* Makefile.tpl: Implement soft dependency machinery. Maybe-ize
|
||||
dependencies. Maybe-ize build-libiberty. Create dummy install
|
||||
targets for 'no_install' modules.
|
||||
* configure: Move GDB_TK substitution to configure.in. Move
|
||||
build_modules stuff to configure.in.
|
||||
* configure.in: Implement soft dependency machinery. Maybe-ize
|
||||
GDB_TK, rearrange slightly. Move build_modules stuff from configure.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2002-12-01 Nathanael Nerode <neroden@gcc.gnu.org>
|
||||
|
||||
(continuing slow-motion replay)
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ host_modules= { module= tix; with_x=true; };
|
|||
host_modules= { module= libtermcap; no_check=true; no_clean=true; };
|
||||
host_modules= { module= utils; no_check=true; };
|
||||
|
||||
target_modules = { module= libstdc++-v3; };
|
||||
target_modules = { module= libstdc++-v3; raw_cxx=true; };
|
||||
target_modules = { module= newlib; };
|
||||
target_modules = { module= libf2c; };
|
||||
target_modules = { module= libobjc; };
|
||||
|
|
@ -83,7 +83,7 @@ target_modules = { module= libiberty; };
|
|||
target_modules = { module= gperf; };
|
||||
target_modules = { module= examples; no_check=true; no_install=true; };
|
||||
target_modules = { module= libffi; no_install=true; };
|
||||
target_modules = { module= libjava; };
|
||||
target_modules = { module= libjava; raw_cxx=true; };
|
||||
target_modules = { module= zlib; };
|
||||
target_modules = { module= boehm-gc; };
|
||||
target_modules = { module= qthreads; };
|
||||
|
|
|
|||
3525
Makefile.in
3525
Makefile.in
File diff suppressed because it is too large
Load Diff
316
Makefile.tpl
316
Makefile.tpl
|
|
@ -256,7 +256,9 @@ REALLY_SET_LIB_PATH = \
|
|||
FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
|
||||
CC_FOR_TARGET = @CC_FOR_TARGET@
|
||||
CXX_FOR_TARGET = @CXX_FOR_TARGET@
|
||||
RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@
|
||||
CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
|
||||
RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@
|
||||
GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
|
||||
|
||||
# If GCC_FOR_TARGET is not overriden on the command line, then this
|
||||
|
|
@ -439,7 +441,8 @@ BASE_FLAGS_TO_PASS = \
|
|||
# so we pass these variables down unchanged. They must not contain
|
||||
# single nor double quotes.
|
||||
RECURSE_FLAGS = \
|
||||
CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)'
|
||||
CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
|
||||
RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
|
||||
|
||||
# Flags to pass down to most sub-makes, in which we're building with
|
||||
# the host environment.
|
||||
|
|
@ -522,18 +525,6 @@ EXTRA_GCC_FLAGS = \
|
|||
|
||||
GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
|
||||
|
||||
# This is a list of the targets for all of the modules which are compiled
|
||||
# using the build machine's native compiler. Configure edits the second
|
||||
# macro for build!=host builds.
|
||||
ALL_BUILD_MODULES_LIST = \
|
||||
all-build-libiberty
|
||||
ALL_BUILD_MODULES = @all_build_modules@
|
||||
|
||||
# This is a list of the configure targets for all of the modules which
|
||||
# are compiled using the native tools.
|
||||
CONFIGURE_BUILD_MODULES = \
|
||||
configure-build-libiberty
|
||||
|
||||
# This is a list of the configure targets for all of the modules which
|
||||
# are compiled using the target tools.
|
||||
CONFIGURE_TARGET_MODULES = [+ FOR target_modules +]\
|
||||
|
|
@ -792,7 +783,8 @@ gcc-no-fixedincludes:
|
|||
# These rules are used to build the modules which are built with the
|
||||
# build machine's native compiler.
|
||||
[+ FOR build_modules +]
|
||||
.PHONY: all-build-[+module+]
|
||||
.PHONY: all-build-[+module+] maybe-all-build-[+module+]
|
||||
maybe-all-build-[+module+]:
|
||||
all-build-[+module+]:
|
||||
@if [ -f ./[+module+]/Makefile ] ; then \
|
||||
r=`${PWD}`; export r; \
|
||||
|
|
@ -802,7 +794,8 @@ all-build-[+module+]:
|
|||
true; \
|
||||
fi
|
||||
|
||||
.PHONY: configure-build-[+module+]
|
||||
.PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
|
||||
maybe-configure-build-[+module+]:
|
||||
configure-build-[+module+]:
|
||||
@if [ ! -d $(BUILD_SUBDIR) ]; then \
|
||||
true; \
|
||||
|
|
@ -861,24 +854,11 @@ configure-build-[+module+]:
|
|||
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]"; \
|
||||
fi; \
|
||||
if [ -f $${libsrcdir}/configure ] ; then \
|
||||
rm -f no-such-file skip-this-dir; \
|
||||
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
|
||||
$(BUILD_CONFIGARGS) $${srcdiroption} \
|
||||
--with-build-subdir="$(BUILD_SUBDIR)"; \
|
||||
else \
|
||||
rm -f no-such-file skip-this-dir; \
|
||||
CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
|
||||
$(BUILD_CONFIGARGS) $${srcdiroption} \
|
||||
--with-build-subdir="$(BUILD_SUBDIR)"; \
|
||||
fi || exit 1; \
|
||||
if [ -f skip-this-dir ] ; then \
|
||||
sh skip-this-dir; \
|
||||
rm -f skip-this-dir; \
|
||||
cd ..; rmdir [+module+] || true; \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
rm -f no-such-file || : ; \
|
||||
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
|
||||
$(BUILD_CONFIGARGS) $${srcdiroption} \
|
||||
--with-build-subdir="$(BUILD_SUBDIR)" \
|
||||
|| exit 1; \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
|
|
@ -890,20 +870,16 @@ configure-build-[+module+]:
|
|||
# These rules are used to build the modules which use FLAGS_TO_PASS. To
|
||||
# build a target all-X means to cd to X and make all.
|
||||
[+ FOR host_modules +]
|
||||
.PHONY: all-[+module+]
|
||||
.PHONY: all-[+module+] maybe-all-[+module+]
|
||||
maybe-all-[+module+]:
|
||||
all-[+module+]:
|
||||
@dir=[+module+]; \
|
||||
if [ -f ./[+module+]/Makefile ] ; then \
|
||||
r=`${PWD}`; export r; \
|
||||
@r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
(cd [+module+]; $(MAKE) $(FLAGS_TO_PASS)[+
|
||||
IF with_x
|
||||
+] $(X11_FLAGS_TO_PASS)[+
|
||||
ENDIF with_x +] all); \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
ENDIF with_x +] all)
|
||||
|
||||
[+ IF no_check +]
|
||||
.PHONY: check-[+module+]
|
||||
|
|
@ -913,8 +889,6 @@ check-[+module+]:
|
|||
# This module is only tested in a native toolchain.
|
||||
check-[+module+]:
|
||||
@if [ '$(host_canonical)' = '$(target_canonical)' ] ; then \
|
||||
dir=[+module+]; \
|
||||
if [ -f ./[+module+]/Makefile ] ; then \
|
||||
r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
|
|
@ -922,55 +896,44 @@ check-[+module+]:
|
|||
IF with_x
|
||||
+] $(X11_FLAGS_TO_PASS)[+
|
||||
ENDIF with_x +] check); \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
fi
|
||||
[+ ELSE check +]
|
||||
.PHONY: check-[+module+]
|
||||
check-[+module+]:
|
||||
@dir=[+module+]; \
|
||||
if [ -f ./[+module+]/Makefile ] ; then \
|
||||
r=`${PWD}`; export r; \
|
||||
@r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
(cd [+module+]; $(MAKE) $(FLAGS_TO_PASS)[+
|
||||
IF with_x
|
||||
+] $(X11_FLAGS_TO_PASS)[+
|
||||
ENDIF with_x +] check); \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
ENDIF with_x +] check)
|
||||
[+ ENDIF no_check +]
|
||||
|
||||
[+ IF no_install +]
|
||||
.PHONY: install-[+module+]
|
||||
.PHONY: install-[+module+] maybe-install-[+module+]
|
||||
maybe-install-[+module+]:
|
||||
install-[+module+]:
|
||||
[+ ELSE install +]
|
||||
.PHONY: install-[+module+]
|
||||
.PHONY: install-[+module+] maybe-install-[+module+]
|
||||
maybe-install-[+module+]:
|
||||
install-[+module+]: installdirs
|
||||
@dir=[+module+]; \
|
||||
if [ -f ./[+module+]/Makefile ] ; then \
|
||||
r=`${PWD}`; export r; \
|
||||
@r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
(cd [+module+]; $(MAKE) $(FLAGS_TO_PASS)[+
|
||||
IF with_x
|
||||
+] $(X11_FLAGS_TO_PASS)[+
|
||||
ENDIF with_x +] install); \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
ENDIF with_x +] install)
|
||||
[+ ENDIF no_install +]
|
||||
[+ ENDFOR host_modules +]
|
||||
|
||||
# These rules are used to build the modules which are built with the target
|
||||
# tools. To make foo-X means to cd to X and make foo.
|
||||
[+ FOR target_modules +]
|
||||
.PHONY: configure-target-[+module+]
|
||||
.PHONY: configure-target-[+module+] maybe-configure-target-[+module+]
|
||||
maybe-configure-target-[+module+]:
|
||||
configure-target-[+module+]:
|
||||
@if [ -d $(TARGET_SUBDIR)/[+module+] ]; then \
|
||||
r=`${PWD}`; export r; \
|
||||
@r=`${PWD}`; export r; \
|
||||
$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/[+module+]/tmpmulti.out 2> /dev/null; \
|
||||
if [ -s $(TARGET_SUBDIR)/[+module+]/tmpmulti.out ]; then \
|
||||
if [ -f $(TARGET_SUBDIR)/[+module+]/multilib.out ]; then \
|
||||
|
|
@ -984,15 +947,8 @@ configure-target-[+module+]:
|
|||
else \
|
||||
mv $(TARGET_SUBDIR)/[+module+]/tmpmulti.out $(TARGET_SUBDIR)/[+module+]/multilib.out; \
|
||||
fi; \
|
||||
fi; \
|
||||
fi; exit 0 # break command into two pieces
|
||||
@dir=[+module+] ; \
|
||||
if [ ! -d $(TARGET_SUBDIR) ]; then \
|
||||
true; \
|
||||
elif [ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] ; then \
|
||||
true; \
|
||||
elif echo " $(TARGET_CONFIGDIRS) " | grep " [+module+] " >/dev/null 2>&1; then \
|
||||
if [ -d $(srcdir)/[+module+] ]; then \
|
||||
@if [ -d $(srcdir)/[+module+] ]; then \
|
||||
[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\
|
||||
r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
|
|
@ -1000,8 +956,13 @@ configure-target-[+module+]:
|
|||
AR="$(AR_FOR_TARGET)"; export AR; \
|
||||
AS="$(AS_FOR_TARGET)"; export AS; \
|
||||
CC="$(CC_FOR_TARGET)"; export CC; \
|
||||
CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
|
||||
CXX="$(CXX_FOR_TARGET)"; export CXX; \
|
||||
CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \[+
|
||||
IF raw_cxx +]
|
||||
CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
|
||||
CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; \[+
|
||||
ELSE normal_cxx +]
|
||||
CXX="$(CXX_FOR_TARGET)"; export CXX; \[+
|
||||
ENDIF raw_cxx +]
|
||||
CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
|
||||
GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
|
||||
DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
|
||||
|
|
@ -1045,43 +1006,27 @@ configure-target-[+module+]:
|
|||
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
|
||||
libsrcdir="$$s/[+module+]"; \
|
||||
fi; \
|
||||
if [ -f $${libsrcdir}/configure ] ; then \
|
||||
rm -f no-such-file skip-this-dir; \
|
||||
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
|
||||
$(TARGET_CONFIGARGS) $${srcdiroption} \
|
||||
--with-target-subdir="$(TARGET_SUBDIR)"; \
|
||||
else \
|
||||
rm -f no-such-file skip-this-dir; \
|
||||
CONFIG_SITE=no-such-file $(SHELL) $$s/configure \
|
||||
$(TARGET_CONFIGARGS) $${srcdiroption} \
|
||||
--with-target-subdir="$(TARGET_SUBDIR)"; \
|
||||
fi || exit 1; \
|
||||
if [ -f skip-this-dir ] ; then \
|
||||
sh skip-this-dir; \
|
||||
rm -f skip-this-dir; \
|
||||
cd ..; rmdir [+module+] || true; \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
rm -f no-such-file || : ; \
|
||||
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
|
||||
$(TARGET_CONFIGARGS) $${srcdiroption} \
|
||||
--with-target-subdir="$(TARGET_SUBDIR)" \
|
||||
|| exit 1; \
|
||||
else \
|
||||
true; \
|
||||
fi; \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
fi
|
||||
|
||||
.PHONY: all-target-[+module+]
|
||||
.PHONY: all-target-[+module+] maybe-all-target-[+module+]
|
||||
maybe-all-target-[+module+]:
|
||||
all-target-[+module+]:
|
||||
@dir=[+module+] ; \
|
||||
if [ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] ; then \
|
||||
r=`${PWD}`; export r; \
|
||||
@r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
(cd $(TARGET_SUBDIR)/[+module+]; \
|
||||
$(MAKE) $(TARGET_FLAGS_TO_PASS) all); \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
$(MAKE) $(TARGET_FLAGS_TO_PASS) [+
|
||||
IF raw_cxx
|
||||
+] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+
|
||||
ENDIF raw_cxx
|
||||
+] all)
|
||||
[+ IF no_check +]
|
||||
# Dummy target for uncheckable module.
|
||||
.PHONY: check-target-[+module+]
|
||||
|
|
@ -1089,35 +1034,36 @@ check-target-[+module+]:
|
|||
[+ ELSE check +]
|
||||
.PHONY: check-target-[+module+]
|
||||
check-target-[+module+]:
|
||||
@dir=[+module+] ; \
|
||||
if [ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] ; then \
|
||||
r=`${PWD}`; export r; \
|
||||
@r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
(cd $(TARGET_SUBDIR)/[+module+]; \
|
||||
$(MAKE) $(TARGET_FLAGS_TO_PASS) check);\
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
$(MAKE) $(TARGET_FLAGS_TO_PASS) [+
|
||||
IF raw_cxx
|
||||
+] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+
|
||||
ENDIF raw_cxx
|
||||
+] check)
|
||||
[+ ENDIF no_check +]
|
||||
[+ IF no_install +][+ ELSE install +]\
|
||||
.PHONY: install-target-[+module+]
|
||||
[+ IF no_install +]
|
||||
.PHONY: install-target-[+module+] maybe-install-target-[+module+]
|
||||
maybe-install-target-[+module+]:
|
||||
# Dummy target for uninstallable.
|
||||
install-target-[+module+]:
|
||||
[+ ELSE install +]
|
||||
.PHONY: install-target-[+module+] maybe-install-target-[+module+]
|
||||
maybe-install-target-[+module+]:
|
||||
install-target-[+module+]: installdirs
|
||||
@dir=[+module+] ; \
|
||||
if [ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] ; then \
|
||||
r=`${PWD}`; export r; \
|
||||
@r=`${PWD}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD}`; export s; \
|
||||
$(SET_LIB_PATH) \
|
||||
(cd $(TARGET_SUBDIR)/[+module+]; \
|
||||
$(MAKE) $(TARGET_FLAGS_TO_PASS) install); \
|
||||
else \
|
||||
true; \
|
||||
fi
|
||||
$(MAKE) $(TARGET_FLAGS_TO_PASS) install)
|
||||
[+ ENDIF no_install +]
|
||||
[+ ENDFOR target_modules +]
|
||||
|
||||
# gcc is the only module which uses GCC_FLAGS_TO_PASS.
|
||||
.PHONY: all-gcc
|
||||
.PHONY: all-gcc maybe-all-gcc
|
||||
maybe-all-gcc:
|
||||
all-gcc:
|
||||
@if [ -f ./gcc/Makefile ] ; then \
|
||||
r=`${PWD}`; export r; \
|
||||
|
|
@ -1204,7 +1150,8 @@ check-c++:
|
|||
true; \
|
||||
fi
|
||||
|
||||
.PHONY: install-gcc
|
||||
.PHONY: install-gcc maybe-install-gcc
|
||||
maybe-install-gcc:
|
||||
install-gcc:
|
||||
@if [ -f ./gcc/Makefile ] ; then \
|
||||
r=`${PWD}`; export r; \
|
||||
|
|
@ -1215,98 +1162,103 @@ install-gcc:
|
|||
true; \
|
||||
fi
|
||||
|
||||
ALL_GCC = all-gcc
|
||||
ALL_GCC_C = $(ALL_GCC) all-target-newlib all-target-libgloss
|
||||
ALL_GCC_CXX = $(ALL_GCC_C) all-target-libstdc++-v3
|
||||
ALL_GCC = maybe-all-gcc
|
||||
ALL_GCC_C = $(ALL_GCC) maybe-all-target-newlib maybe-all-target-libgloss
|
||||
ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3
|
||||
|
||||
# This is a list of inter-dependencies among modules.
|
||||
all-autoconf: all-m4 all-texinfo
|
||||
all-automake: all-m4 all-texinfo
|
||||
all-bfd: all-libiberty all-intl
|
||||
all-binutils: all-libiberty all-opcodes all-bfd all-flex all-bison all-byacc all-intl
|
||||
all-bison: all-texinfo
|
||||
configure-target-boehm-gc: $(ALL_GCC_C) configure-target-qthreads
|
||||
all-dejagnu: all-tcl all-expect all-tk
|
||||
all-diff: all-libiberty
|
||||
all-autoconf: maybe-all-m4 maybe-all-texinfo
|
||||
all-automake: maybe-all-m4 maybe-all-texinfo
|
||||
all-bfd: maybe-all-libiberty maybe-all-intl
|
||||
all-binutils: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-flex maybe-all-bison maybe-all-byacc maybe-all-intl
|
||||
all-bison: maybe-all-texinfo
|
||||
configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads
|
||||
all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk
|
||||
all-diff: maybe-all-libiberty
|
||||
configure-target-examples: $(ALL_GCC_C)
|
||||
all-expect: all-tcl all-tk
|
||||
all-fileutils: all-libiberty
|
||||
all-flex: all-libiberty all-bison all-byacc
|
||||
all-gas: all-libiberty all-opcodes all-bfd all-intl
|
||||
all-gcc: all-libiberty all-bison all-byacc all-binutils all-gas all-ld all-zlib
|
||||
all-bootstrap: all-libiberty all-texinfo all-bison all-byacc all-binutils all-gas all-ld all-zlib
|
||||
all-expect: maybe-all-tcl maybe-all-tk
|
||||
all-fileutils: maybe-all-libiberty
|
||||
all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc
|
||||
all-gas: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-intl
|
||||
all-gcc: maybe-all-libiberty maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib
|
||||
all-bootstrap: maybe-all-libiberty maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib
|
||||
GDB_TK = @GDB_TK@
|
||||
all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
|
||||
all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK)
|
||||
configure-target-gperf: $(ALL_GCC_CXX)
|
||||
all-target-gperf: all-target-libiberty all-target-libstdc++-v3
|
||||
all-gprof: all-libiberty all-bfd all-opcodes all-intl
|
||||
all-grep: all-libiberty
|
||||
all-gzip: all-libiberty
|
||||
all-hello: all-libiberty
|
||||
all-itcl: all-tcl all-tk
|
||||
all-ld: all-libiberty all-bfd all-opcodes all-bison all-byacc all-flex all-intl
|
||||
all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3
|
||||
all-gprof: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-intl
|
||||
all-grep: maybe-all-libiberty
|
||||
all-gzip: maybe-all-libiberty
|
||||
all-hello: maybe-all-libiberty
|
||||
all-itcl: maybe-all-tcl maybe-all-tk
|
||||
all-ld: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-intl
|
||||
configure-target-libgloss: $(ALL_GCC)
|
||||
all-target-libgloss: configure-target-newlib
|
||||
all-libgui: all-tcl all-tk all-itcl
|
||||
all-target-libgloss: maybe-configure-target-newlib
|
||||
all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl
|
||||
configure-target-libffi: $(ALL_GCC_C)
|
||||
configure-target-libjava: $(ALL_GCC_C) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi
|
||||
all-target-libjava: all-fastjar all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi
|
||||
configure-target-libjava: $(ALL_GCC_C) maybe-configure-target-zlib maybe-configure-target-boehm-gc maybe-configure-target-qthreads maybe-configure-target-libffi
|
||||
all-target-libjava: maybe-all-fastjar maybe-all-target-zlib maybe-all-target-boehm-gc maybe-all-target-qthreads maybe-all-target-libffi
|
||||
configure-target-libstdc++-v3: $(ALL_GCC_C)
|
||||
all-target-libstdc++-v3: all-target-libiberty
|
||||
all-target-libstdc++-v3: maybe-all-target-libiberty
|
||||
configure-target-libf2c: $(ALL_GCC_C)
|
||||
all-target-libf2c: all-target-libiberty
|
||||
all-target-libf2c: maybe-all-target-libiberty
|
||||
configure-target-libobjc: $(ALL_GCC_C)
|
||||
all-target-libobjc: all-target-libiberty
|
||||
all-m4: all-libiberty all-texinfo
|
||||
all-make: all-libiberty
|
||||
all-target-libobjc: maybe-all-target-libiberty
|
||||
all-m4: maybe-all-libiberty maybe-all-texinfo
|
||||
all-make: maybe-all-libiberty
|
||||
configure-target-newlib: $(ALL_GCC)
|
||||
configure-target-libtermcap: $(ALL_GCC_C)
|
||||
all-opcodes: all-bfd all-libiberty
|
||||
all-patch: all-libiberty
|
||||
all-prms: all-libiberty
|
||||
all-opcodes: maybe-all-bfd maybe-all-libiberty
|
||||
all-patch: maybe-all-libiberty
|
||||
all-prms: maybe-all-libiberty
|
||||
configure-target-qthreads: $(ALL_GCC_C)
|
||||
all-recode: all-libiberty
|
||||
all-sed: all-libiberty
|
||||
all-send-pr: all-prms
|
||||
all-sid: all-tcl all-tk
|
||||
all-sim: all-libiberty all-bfd all-opcodes all-readline
|
||||
all-snavigator: all-tcl all-tk all-itcl all-tix all-db all-grep all-libgui
|
||||
all-tar: all-libiberty
|
||||
all-tclX: all-tcl all-tk
|
||||
all-tk: all-tcl
|
||||
all-texinfo: all-libiberty
|
||||
all-tix: all-tcl all-tk
|
||||
all-recode: maybe-all-libiberty
|
||||
all-sed: maybe-all-libiberty
|
||||
all-send-pr: maybe-all-prms
|
||||
all-sid: maybe-all-tcl maybe-all-tk
|
||||
all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline
|
||||
all-snavigator: maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-db maybe-all-grep maybe-all-libgui
|
||||
all-tar: maybe-all-libiberty
|
||||
all-tclX: maybe-all-tcl maybe-all-tk
|
||||
all-tk: maybe-all-tcl
|
||||
all-texinfo: maybe-all-libiberty
|
||||
all-tix: maybe-all-tcl maybe-all-tk
|
||||
configure-target-winsup: $(ALL_GCC_C)
|
||||
all-target-winsup: all-target-libiberty all-target-libtermcap
|
||||
all-uudecode: all-libiberty
|
||||
all-target-winsup: maybe-all-target-libiberty maybe-all-target-libtermcap
|
||||
all-uudecode: maybe-all-libiberty
|
||||
configure-target-zlib: $(ALL_GCC_C)
|
||||
all-fastjar: all-zlib all-libiberty
|
||||
configure-target-fastjar: configure-target-zlib
|
||||
all-target-fastjar: all-target-zlib all-target-libiberty
|
||||
all-fastjar: maybe-all-zlib maybe-all-libiberty
|
||||
configure-target-fastjar: maybe-configure-target-zlib
|
||||
all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty
|
||||
configure-target-libiberty: $(ALL_GCC_C)
|
||||
install-gdb: install-tcl install-tk install-itcl install-tix install-libgui
|
||||
install-sid: install-tcl install-tk
|
||||
install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui
|
||||
install-sid: maybe-install-tcl maybe-install-tk
|
||||
|
||||
# We put install-opcodes before install-binutils because the installed
|
||||
# binutils might be on PATH, and they might need the shared opcodes
|
||||
# library.
|
||||
install-binutils: install-opcodes
|
||||
install-binutils: maybe-install-opcodes
|
||||
|
||||
# We put install-tcl before install-itcl because itcl wants to run a
|
||||
# program on installation which uses the Tcl libraries.
|
||||
install-itcl: install-tcl
|
||||
install-itcl: maybe-install-tcl
|
||||
|
||||
# This is a slightly kludgy method of getting dependencies on
|
||||
# all-build-libiberty correct; it would be better to build it every time.
|
||||
all-gcc: @all_build_modules@
|
||||
all-gcc: maybe-all-build-libiberty
|
||||
|
||||
# Dependencies of all-build-foo on configure-build-foo.
|
||||
all-build-libiberty: configure-build-libiberty
|
||||
[+ FOR build_modules +]all-build-[+module+]: configure-build-[+module+]
|
||||
[+ ENDFOR build_modules +]
|
||||
|
||||
# Dependencies of all-target-foo on configure-target-foo.
|
||||
[+ FOR target_modules +]all-target-[+module+]: configure-target-[+module+]
|
||||
[+ ENDFOR target_modules +]
|
||||
|
||||
# Dependencies of maybe-foo on foo. These are used because, for example,
|
||||
# all-gcc only depends on all-gas if gas is present and being configured.
|
||||
@maybe_dependencies@
|
||||
|
||||
### other supporting targets
|
||||
|
||||
MAKEDIRS= \
|
||||
|
|
|
|||
|
|
@ -682,24 +682,8 @@ fi
|
|||
|
||||
### do common part of configure.in
|
||||
|
||||
# If the language specific compiler does not exist, but the "gcc" directory does,
|
||||
# we will skip this directory; in this case the sub-directory's common part
|
||||
# of configure.in will create a small shell script "skip-this-dir" containing
|
||||
# commands to completely clean up any temporary or created files.
|
||||
|
||||
. ${tmpfile}.com
|
||||
|
||||
if test -f skip-this-dir; then
|
||||
# Perform the same cleanup as the trap handler, minus the "exit 1" of course,
|
||||
# and reset the trap handler.
|
||||
trap 0
|
||||
rm -rf Makefile* ${tmpdir}
|
||||
# Execute the final clean-up actions
|
||||
${config_shell} skip-this-dir
|
||||
# and stop configuring this directory.
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# some sanity checks on configure.in
|
||||
case "${srctrigger}" in
|
||||
"")
|
||||
|
|
@ -1107,12 +1091,6 @@ export CXX
|
|||
export CFLAGS
|
||||
export CXXFLAGS
|
||||
|
||||
all_build_modules=
|
||||
if test x"${build_alias}" != x"${host_alias}"
|
||||
then
|
||||
all_build_modules='$(ALL_BUILD_MODULES_LIST)'
|
||||
fi
|
||||
|
||||
# FIXME Should this be done recursively ??? (Useful for e.g. gdbtest)
|
||||
# Set up the list of links to be made.
|
||||
# ${links} is the list of link names, and ${files} is the list of names to link to.
|
||||
|
|
@ -1323,7 +1301,6 @@ if [ -f ${srcdir}/${Makefile_in} ] ; then
|
|||
-e "s|@oldincludedir@|${oldincludedir}|" \
|
||||
-e "s|@infodir@|${infodir}|" \
|
||||
-e "s|@mandir@|${mandir}|" \
|
||||
-e "s|@all_build_modules@|${all_build_modules}|" \
|
||||
-e "/^CC[ ]*=/{
|
||||
:loop1
|
||||
/\\\\$/ N
|
||||
|
|
@ -1362,8 +1339,6 @@ if [ -f ${srcdir}/${Makefile_in} ] ; then
|
|||
-e "s:@DEFAULT_LEX@:${DEFAULT_LEX}:" \
|
||||
-e "s:@DEFAULT_M4@:${DEFAULT_M4}:" \
|
||||
./Makefile.tem > ${Makefile}
|
||||
sed -e "s:@GDB_TK@:${GDB_TK}:" ${Makefile} >${Makefile}.tem
|
||||
mv -f ${Makefile}.tem ${Makefile}
|
||||
|
||||
# If this is a Canadian Cross, preset the values of many more
|
||||
# tools.
|
||||
|
|
|
|||
71
configure.in
71
configure.in
|
|
@ -848,13 +848,6 @@ case "$host" in
|
|||
*msdosdjgpp*)
|
||||
enable_gdbtk=no ;;
|
||||
esac
|
||||
# Determine whether gdb needs tk/tcl or not.
|
||||
case "$enable_gdbtk" in
|
||||
no)
|
||||
GDB_TK="" ;;
|
||||
*)
|
||||
GDB_TK="all-tcl all-tk all-itcl all-tix all-libgui" ;;
|
||||
esac
|
||||
|
||||
copy_dirs=
|
||||
|
||||
|
|
@ -1350,25 +1343,67 @@ target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
|
|||
|
||||
# This is the final value for target_configdirs. configdirs already
|
||||
# has its final value. It's time to create some lists of valid targets.
|
||||
|
||||
all_build_modules=
|
||||
configure_build_modules=
|
||||
# Only make build modules if build != host.
|
||||
# This should be done more generally, but at the moment it doesn't matter.
|
||||
if test ${host_alias} != ${build_alias} ; then
|
||||
all_build_modules=all-build-libiberty
|
||||
configure_build_modules=configure-build-libiberty
|
||||
fi
|
||||
|
||||
all_host_modules=
|
||||
check_host_modules=
|
||||
install_host_modules=
|
||||
configure_host_modules=
|
||||
for module in ${configdirs} ; do
|
||||
all_host_modules="${all_host_modules} all-${module}"
|
||||
check_host_modules="${check_host_modules} check-${module}"
|
||||
install_host_modules="${install_host_modules} install-${module}"
|
||||
configure_host_modules="${configure_host_modules} configure-${module}"
|
||||
done
|
||||
install_host_modules_nogcc=`echo "${install_host_modules}" | sed -e 's/install-gcc//g'`
|
||||
|
||||
all_target_modules=
|
||||
check_target_modules=
|
||||
install_target_modules=
|
||||
configure_target_modules=
|
||||
for module in ${target_configdirs} ; do
|
||||
all_target_modules="${all_target_modules} all-target-${module}"
|
||||
check_target_modules="${check_target_modules} check-target-${module}"
|
||||
install_target_modules="${install_target_modules} install-target-${module}"
|
||||
configure_target_modules="${configure_target_modules} configure-target-${module}"
|
||||
done
|
||||
|
||||
# Determine whether gdb needs tk/tcl or not.
|
||||
# Use 'maybe' since enable_gdbtk might be true even if tk isn't available
|
||||
# and in that case we want gdb to be built without tk. Ugh!
|
||||
# In fact I believe gdb is the *only* package directly dependent on tk,
|
||||
# so we should be able to put the 'maybe's in unconditionally and
|
||||
# leave out the maybe dependencies when enable_gdbtk is false. I'm not
|
||||
# 100% sure that that's safe though.
|
||||
case "$enable_gdbtk" in
|
||||
no)
|
||||
GDB_TK="" ;;
|
||||
*)
|
||||
GDB_TK="maybe-all-tcl maybe-all-tk maybe-all-itcl maybe-all-tix maybe-all-libgui" ;;
|
||||
esac
|
||||
|
||||
# Create the 'maybe dependencies'. This uses a temporary file.
|
||||
rm -f maybedep.tmp
|
||||
for item in ${all_build_modules} ${all_host_modules} ${all_target_modules} \
|
||||
${install_host_modules} ${install_target_modules} \
|
||||
${configure_build_modules} ${configure_host_modules} ${configure_target_modules} \
|
||||
; do
|
||||
echo "maybe-${item}: ${item}" >> maybedep.tmp
|
||||
done
|
||||
sed -e '/@maybe_dependencies@/r maybedep.tmp' \
|
||||
-e 's/@maybe_dependencies@//' Makefile > Makefile.tem
|
||||
rm -f Makefile
|
||||
mv -f Makefile.tem Makefile
|
||||
rm -f maybedep.tmp
|
||||
|
||||
# Base args. Strip norecursion, cache-file, srcdir, host, build, target.
|
||||
# These are the ones we might not want to pass down to subconfigures.
|
||||
baseargs=`echo "${arguments}" | \
|
||||
|
|
@ -1535,7 +1570,8 @@ case $GCJ_FOR_TARGET in
|
|||
esac
|
||||
|
||||
# Don't use libstdc++-v3's flags to configure/build itself.
|
||||
libstdcxx_flags='`case $$dir in libstdc++-v3 | libjava) ;; *) test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags --build-includes;; esac` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
|
||||
libstdcxx_flags='`test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags --build-includes` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
|
||||
raw_libstdcxx_flags=' -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs'
|
||||
|
||||
if test "x${CXX_FOR_TARGET+set}" = xset; then
|
||||
:
|
||||
|
|
@ -1543,17 +1579,28 @@ elif test -d ${srcdir}/gcc; then
|
|||
# We add -shared-libgcc to CXX_FOR_TARGET whenever we use xgcc instead
|
||||
# of g++ for linking C++ or Java, because g++ has -shared-libgcc by
|
||||
# default whereas gcc does not.
|
||||
CXX_FOR_TARGET='$$r/gcc/`case $$dir in libstdc++-v3 | libjava) echo xgcc -shared-libgcc ;; *) echo g++ ;; esac` -B$$r/gcc/ -nostdinc++ '$libstdcxx_flags
|
||||
# RAW_CXX_FOR_TARGET is for linking C++ or java; CXX_FOR_TARGET is for
|
||||
# all other cases.
|
||||
CXX_FOR_TARGET='$$r/gcc/g++ -B$$r/gcc/ -nostdinc++ '$libstdcxx_flags
|
||||
RAW_CXX_FOR_TARGET='$$r/gcc/xgcc -shared-libgcc -B$$r/gcc/ -nostdinc++ '$raw_libstdcxx_flags
|
||||
elif test "$host" = "$target"; then
|
||||
CXX_FOR_TARGET='$(CXX)'
|
||||
RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET}
|
||||
else
|
||||
CXX_FOR_TARGET=`echo c++ | sed -e 's/x/x/' ${program_transform_name}`
|
||||
RAW_CXX_FOR_TARGET=${CXX_FOR_TARGET}
|
||||
fi
|
||||
case $CXX_FOR_TARGET in
|
||||
*' $(FLAGS_FOR_TARGET)') ;;
|
||||
*) CXX_FOR_TARGET=$CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
|
||||
esac
|
||||
case $RAW_CXX_FOR_TARGET in
|
||||
*' $(FLAGS_FOR_TARGET)') ;;
|
||||
*) RAW_CXX_FOR_TARGET=$RAW_CXX_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
|
||||
esac
|
||||
|
||||
qCXX_FOR_TARGET=`echo "$CXX_FOR_TARGET" | sed 's,[&%],\\\&,g'`
|
||||
qRAW_CXX_FOR_TARGET=`echo "$RAW_CXX_FOR_TARGET" | sed 's,[&%],\\\&,g'`
|
||||
|
||||
# We want to defer the evaluation of `cmd`s and shell variables in
|
||||
# CXX_FOR_TARGET when recursing in the top-level Makefile, such as for
|
||||
|
|
@ -1562,9 +1609,13 @@ qCXX_FOR_TARGET=`echo "$CXX_FOR_TARGET" | sed 's,[&%],\\\&,g'`
|
|||
# can be expanded by the nested make as shell variables, not as make
|
||||
# macros.
|
||||
qqCXX_FOR_TARGET=`echo "$qCXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'`
|
||||
qqRAW_CXX_FOR_TARGET=`echo "$qRAW_CXX_FOR_TARGET" | sed -e 's,[$][$],$$$$,g'`
|
||||
|
||||
sedtemp=sed.$$
|
||||
cat >$sedtemp <<EOF
|
||||
s%@GDB_TK@%${GDB_TK}%
|
||||
s%@all_build_modules@%${all_build_modules}%
|
||||
s%@configure_build_modules@%${configure_build_modules}%
|
||||
s%@all_host_modules@%${all_host_modules}%
|
||||
s%@check_host_modules@%${check_host_modules}%
|
||||
s%@install_host_modules@%${install_host_modules}%
|
||||
|
|
@ -1578,7 +1629,9 @@ s%@FLAGS_FOR_TARGET@%${FLAGS_FOR_TARGET}%
|
|||
s%@CC_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}%
|
||||
s%@GCJ_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}%
|
||||
s%@CXX_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}%
|
||||
s%@RAW_CXX_FOR_TARGET@%\$(STAGE_CC_WRAPPER) ${qRAW_CXX_FOR_TARGET}%
|
||||
s%@CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%\$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}%
|
||||
s%@RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@%\$(STAGE_CC_WRAPPER) ${qqRAW_CXX_FOR_TARGET}%
|
||||
s%@target_subdir@%${target_subdir}%
|
||||
s%@build_subdir@%${build_subdir}%
|
||||
s%@build_configargs@%${buildargs}%
|
||||
|
|
|
|||
Loading…
Reference in New Issue