diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2005-02-28 17:07:03 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2005-02-28 17:07:03 +0300 |
| commit | 7fc2ca22c11a6fa8a5de0ecec321188b7c9ac8cb (patch) | |
| tree | 3d3e02a9488b581ad8c6c99443df29228178c8c3 /config/acx.m4 | |
| parent | 496337c9a58d7b107ab2a6dfdd25347479cfaa37 (diff) | |
2005-02-28 Paolo Bonzini <bonzini@gnu.org>
Sync from gcc.
2005-02-28 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.
Merged from libada-gnattools-branch:
2004-11-28 Nathanael Nerode <neroden@gcc.gnu.org>
* 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 <bonzini@gnu.org>
PR bootstrap/17383
* acx.m4 (GCC_TOPLEV_SUBDIRS): Set HOST_SUBDIR if an in-src
gcc build is going.
Diffstat (limited to 'config/acx.m4')
| -rw-r--r-- | config/acx.m4 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config/acx.m4 b/config/acx.m4 index d4a583dc6..6d3e6d5d5 100644 --- a/config/acx.m4 +++ b/config/acx.m4 @@ -76,8 +76,13 @@ AC_DEFUN([GCC_TOPLEV_SUBDIRS], AC_REQUIRE([_GCC_TOPLEV_NONCANONICAL_BUILD]) []dnl # Prefix 'build-' so this never conflicts with target_subdir. build_subdir="build-${build_noncanonical}" -# Not really a subdirectory, but here for completeness. -host_subdir=. +# --srcdir=. covers the toplevel, while "test -d" covers the subdirectories +if ( test $srcdir = . && test -d gcc ) \ + || test -d $srcdir/../host-${host_noncanonical}; then + host_subdir="host-${host_noncanonical}" +else + host_subdir=. +fi # No prefix. target_subdir=${target_noncanonical} AC_SUBST([build_subdir]) []dnl |