From c1eb9e31184d0baca3ffbfe9b64dd6186a068ddc Mon Sep 17 00:00:00 2001 From: bonzini Date: Mon, 28 Feb 2005 13:26:36 +0000 Subject: 2005-05-25 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. config: 2005-05-25 Paolo Bonzini PR bootstrap/17383 * config/acx.m4 (GCC_TOPLEV_SUBDIRS): Set HOST_SUBDIR if an in-src gcc build is going. gcc: 2005-05-25 Paolo Bonzini PR bootstrap/17383 * gcc/Makefile.in (host_subdir): New. (build_objdir): New. Replace ../$(build_subdir) with it throughout. * gcc/configure: Regenerate. libada: 2005-05-25 Paolo Bonzini PR bootstrap/17383 * Makefile.in (GCC_DIR): Add $(HOST_SUBDIR) to the definition. libjava: 2005-05-25 Paolo Bonzini PR bootstrap/17383 * configure.ac: Call GCC_TOPLEV_SUBDIRS. (COMPPATH): Removed. (ZIP, GCJH): Replace it with ../$(host_subdir). (built_gcc_dir): Add $(host_subdir). * configure: Regenerate. * Makefile.in, include/Makefile.in, testsuite/Makefile.in, gcj/Makefile.in, external/Makefile.in, external/sax/Makefile.in, external/w3c_dom/Makefile.in: Regenerate. libobjc: 2005-05-25 Paolo Bonzini PR bootstrap/17383 * configure.ac: Call GCC_TOPLEV_SUBDIRS. (Determine CFLAGS for gthread): Use $host_subdir. * configure: Regenerate. * Makefile.in (host_subdir): New. (INCLUDES): Use it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95680 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/external/Makefile.in | 4 +++- libjava/external/sax/Makefile.in | 4 +++- libjava/external/w3c_dom/Makefile.in | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'libjava/external') diff --git a/libjava/external/Makefile.in b/libjava/external/Makefile.in index a35f042c098..a265571296f 100644 --- a/libjava/external/Makefile.in +++ b/libjava/external/Makefile.in @@ -87,7 +87,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -248,6 +247,7 @@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ +build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ @@ -260,6 +260,7 @@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ +host_subdir = @host_subdir@ host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ @@ -284,6 +285,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ diff --git a/libjava/external/sax/Makefile.in b/libjava/external/sax/Makefile.in index a4b95da0d61..f8bd00261e2 100644 --- a/libjava/external/sax/Makefile.in +++ b/libjava/external/sax/Makefile.in @@ -124,7 +124,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -285,6 +284,7 @@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ +build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ @@ -297,6 +297,7 @@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ +host_subdir = @host_subdir@ host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ @@ -321,6 +322,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ diff --git a/libjava/external/w3c_dom/Makefile.in b/libjava/external/w3c_dom/Makefile.in index 56842d9b5df..9545a9c3dbc 100644 --- a/libjava/external/w3c_dom/Makefile.in +++ b/libjava/external/w3c_dom/Makefile.in @@ -218,7 +218,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -379,6 +378,7 @@ build = @build@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ +build_subdir = @build_subdir@ build_vendor = @build_vendor@ datadir = @datadir@ exec_prefix = @exec_prefix@ @@ -391,6 +391,7 @@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ +host_subdir = @host_subdir@ host_vendor = @host_vendor@ includedir = @includedir@ infodir = @infodir@ @@ -415,6 +416,7 @@ target_alias = @target_alias@ target_cpu = @target_cpu@ target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ -- cgit v1.2.3