diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2005-02-28 13:26:36 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2005-02-28 13:26:36 +0000 |
| commit | 215c351a8245872b7a7f077c28a2ac8b9c66a51a (patch) | |
| tree | 13640b7a4c5eff3775cb5c88898dd94d15ec4dc8 /libjava/gcj | |
| parent | f51d6cb4abfac0c5e9ef9bfac184865d65f4d4a6 (diff) | |
| download | gcc-215c351a8245872b7a7f077c28a2ac8b9c66a51a.zip gcc-215c351a8245872b7a7f077c28a2ac8b9c66a51a.tar.gz gcc-215c351a8245872b7a7f077c28a2ac8b9c66a51a.tar.bz2 | |
re PR bootstrap/17383 (Building in src dir fails)
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
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 <bonzini@gnu.org>
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 <bonzini@gnu.org>
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 <bonzini@gnu.org>
PR bootstrap/17383
* Makefile.in (GCC_DIR): Add $(HOST_SUBDIR) to the definition.
libjava:
2005-05-25 Paolo Bonzini <bonzini@gnu.org>
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 <bonzini@gnu.org>
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.
From-SVN: r95680
Diffstat (limited to 'libjava/gcj')
| -rw-r--r-- | libjava/gcj/Makefile.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libjava/gcj/Makefile.in b/libjava/gcj/Makefile.in index dc528b0..38bcaf3 100644 --- a/libjava/gcj/Makefile.in +++ b/libjava/gcj/Makefile.in @@ -92,7 +92,6 @@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHECKREFSPEC = @CHECKREFSPEC@ CLASSPATH_SEPARATOR = @CLASSPATH_SEPARATOR@ -COMPPATH = @COMPPATH@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -253,6 +252,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@ @@ -265,6 +265,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@ @@ -291,6 +292,7 @@ target_cpu = @target_cpu@ # autoconf2.13's target_alias target_noncanonical = @target_noncanonical@ target_os = @target_os@ +target_subdir = @target_subdir@ target_vendor = @target_vendor@ tool_include_dir = @tool_include_dir@ toolexecdir = @toolexecdir@ |