From 7fc2ca22c11a6fa8a5de0ecec321188b7c9ac8cb Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 28 Feb 2005 14:07:03 +0000 Subject: 2005-02-28 Paolo Bonzini Sync from gcc. 2005-02-28 Paolo Bonzini PR bootstrap/17383 * Makefile.def (target_modules): Remove "stage", now unnecessary. * Makefile.tpl (HOST_SUBDIR): New substitution. (STAGE_HOST_EXPORTS, EXPECT, HOST_LIB_PATH, USUAL_AR_FOR_TARGET, USUAL_AS_FOR_TARGET, USUAL_DLLTOOL_FOR_TARGET, USUAL_GCC_FOR_TARGET, USUAL_LD_FOR_TARGET, USUAL_NM_FOR_TARGET, USUAL_OBJDUMP_FOR_TARGET, USUAL_RANLIB_FOR_TARGET, USUAL_WINDRES_FOR_TARGET): Use it. (Host modules, Bootstrapped modules): Use it. (Build modules, Target modules): Do not create symlink trees, always configure out-of-srcdir. (distclean): Try removing $(host_subdir) with rm before using rm -rf. * configure.in (FLAGS_FOR_TARGET, CC_FOR_TARGET, GCJ_FOR_TARGET, GFORTRAN_FOR_TARGET, CXX_FOR_TARGET, RAW_CXX_FOR_TARGET): Use $(HOST_SUBDIR). Create a symlink for host_subdir. * Makefile.in: Regenerate. * configure: Regenerate. Merged from libada-gnattools-branch: 2004-11-28 Nathanael Nerode * Makefile.def: Add gnattools as a module, depending on target-libada. * Makefile.in: Regenerate. * configure.in: Include gnattools in host_tools; disable it if ada is disabled. * configure: Regenerate. config: 2005-02-28 Paolo Bonzini PR bootstrap/17383 * acx.m4 (GCC_TOPLEV_SUBDIRS): Set HOST_SUBDIR if an in-src gcc build is going. --- Makefile.def | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makefile.def') diff --git a/Makefile.def b/Makefile.def index c6d39f4fc..3565f9832 100644 --- a/Makefile.def +++ b/Makefile.def @@ -111,13 +111,14 @@ host_modules= { module= libtermcap; no_check=true; missing=distclean; missing=maintainer-clean; }; host_modules= { module= utils; no_check=true; }; +host_modules= { module= gnattools; }; target_modules = { module= libstdc++-v3; raw_cxx=true; }; target_modules = { module= libmudflap; }; target_modules = { module= newlib; }; target_modules = { module= libgfortran; }; target_modules = { module= libobjc; }; -target_modules = { module= libtermcap; no_check=true; stage=true; +target_modules = { module= libtermcap; no_check=true; missing=mostlyclean; missing=clean; missing=distclean; @@ -129,7 +130,7 @@ target_modules = { module= gperf; }; target_modules = { module= examples; no_check=true; no_install=true; }; target_modules = { module= libffi; }; target_modules = { module= libjava; raw_cxx=true; }; -target_modules = { module= zlib; stage=true; }; +target_modules = { module= zlib; }; target_modules = { module= boehm-gc; }; target_modules = { module= qthreads; }; target_modules = { module= rda; }; @@ -273,6 +274,8 @@ dependencies = { module=all-libcpp; on=all-intl; }; dependencies = { module=all-fixincludes; on=all-libiberty; }; +dependencies = { module=all-gnattools; on=all-target-libada; }; + // Host modules specific to gdb. dependencies = { module=configure-gdb; on=configure-itcl; }; dependencies = { module=configure-gdb; on=configure-tcl; }; -- cgit v1.2.3