configure.in, configure: Make sure to create the stage* and include symbolic links...

	* configure.in, configure: Make sure to create the stage* and include
	symbolic links in each subdirectory.

copy that's also now in at the FSF; only does it if $symbolic_link is
defined to `ln -s'

From-SVN: r15543

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c199435e7aea1983a97b8789e009b44b16c5c1aa..4ce57ca9cc1dead49fbde76691028dba573aec72 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+1997-09-18  Brendan Kehoe  <brendan@lisa.cygnus.com>
+
+       * configure.in, configure: Make sure to create the stage* and include
+       symbolic links in each subdirectory.
+
 Thu Sep 18 01:47:06 1997  Jeffrey A Law  (law@cygnus.com)
 
        * pa.md (reload_peepholes): Don't allow addresses with side
@@ -18,12 +23,6 @@ Wed Sep 17 18:33:59 1997  Jeffrey A Law  (law@cygnus.com)
        (CPP_SPEC): Include long_max_spec.
        (EXTRA_SPECS): Include long_max_spec.
 
-1997-09-17  Brendan Kehoe  <brendan@lisa.cygnus.com>
-
-       * configure.in, configure: Make sure to create the stage* and include
-       symbolic links in each subdirectory, as we do in configure.lang for
-       non-autoconf configurations.
-
 Wed Sep 17 14:11:38 1997  Jeffrey A Law  (law@cygnus.com)
 
        * v850.c (construct_save_jarl): Fix thinko in last change.

diff --git a/gcc/configure b/gcc/configure
index e3b38f64dd68bdd8d0c67f926eea7a0d9d0fddc4..c3197303290e828dbbe40bac7015ce13d4d63fe9 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -5111,9 +5111,15 @@ case x$CONFIG_HEADERS in
 xconfig.h:config.in)
 echo > cstamp-h ;;
 esac
-# Make sure we create things so -Bstage1/ will work.
-for d in .. ${subdirs} ; do
-  if [ $d != .. ]; then
+# If the host supports symlinks, point stage[1234] at ../stage[1234] so
+# bootstrapping and the installation procedure can still use
+# CC="stage1/xgcc -Bstage1/".  If the host doesn't support symlinks,
+# FLAGS_TO_PASS has been modified to solve the problem there.
+# This is virtually a duplicate of what happens in configure.lang; we do
+# an extra check to make sure this only happens if ln -s can be used.
+if [ "$symbolic_link" = "ln -s" ]; then
+ for d in .. ${subdirs} ; do
+   if [ $d != .. ]; then
        STARTDIR=`pwd`
        cd $d
        for t in stage1 stage2 stage3 stage4 include
@@ -5122,8 +5128,9 @@ for d in .. ${subdirs} ; do
                $symbolic_link ../$t $t 2>/dev/null
        done
        cd $STARTDIR
-  fi
-done
+   fi
+ done
+else true ; fi
 
 exit 0
 EOF

diff --git a/gcc/configure.in b/gcc/configure.in
index 4d991f93df696700d2c629b046917a54487377f7..f0b6a49053e0765570f41cd307fbeee8e5fdd78a 100644 (file)
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -3147,9 +3147,15 @@ case x$CONFIG_HEADERS in
 xconfig.h:config.in)
 echo > cstamp-h ;;
 esac
-# Make sure we create things so -Bstage1/ will work.
-for d in .. ${subdirs} ; do
-  if [ $d != .. ]; then
+# If the host supports symlinks, point stage[1234] at ../stage[1234] so
+# bootstrapping and the installation procedure can still use
+# CC="stage1/xgcc -Bstage1/".  If the host doesn't support symlinks,
+# FLAGS_TO_PASS has been modified to solve the problem there.
+# This is virtually a duplicate of what happens in configure.lang; we do
+# an extra check to make sure this only happens if ln -s can be used.
+if [[ "$symbolic_link" = "ln -s" ]]; then
+ for d in .. ${subdirs} ; do
+   if [[ $d != .. ]]; then
        STARTDIR=`pwd`
        cd $d
        for t in stage1 stage2 stage3 stage4 include
@@ -3158,8 +3164,9 @@ for d in .. ${subdirs} ; do
                $symbolic_link ../$t $t 2>/dev/null
        done
        cd $STARTDIR
-  fi
-done
+   fi
+ done
+else true ; fi
 ],
 [
 host='${host}'