aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/Makefile.in7
2 files changed, 11 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c44575e..38fc516 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 28 06:52:27 2001 Arnaud Charlet <charlet@ACT-Europe.FR>
+
+ * Makefile.in (ORDINARY_FLAGS_TO_PASS): Remove STAGE_PREFIX.
+ (FLAGS_TO_PASS): Add STAGE_PREFIX.
+ (SUBDIR_FLAGS_TO_PASS): Apply PREPEND_DOTDOT_TO_RELATIVE_PATH
+ to STAGE_PREFIX.
+
Wed Nov 28 08:21:47 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
* Makefile.in (OBJS): Sort alphabetically.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index c2f7240..b9c3c15 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -689,7 +689,6 @@ ORDINARY_FLAGS_TO_PASS = \
"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
"RANLIB_TEST_FOR_TARGET=$(RANLIB_TEST_FOR_TARGET)" \
"SHELL=$(SHELL)" \
- "STAGE_PREFIX=@stage_prefix_set_by_configure@" \
"exeext=$(exeext)" \
"build_exeext=$(build_exeext)" \
"objext=$(objext)" \
@@ -703,7 +702,8 @@ ORDINARY_FLAGS_TO_PASS = \
"libsubdir=$(libsubdir)" \
"datadir=$(datadir)" \
"localedir=$(localedir)"
-FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) "CC=@cc_set_by_configure@"
+FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) "CC=@cc_set_by_configure@" \
+ "STAGE_PREFIX=@stage_prefix_set_by_configure@"
PREPEND_DOTDOT_TO_RELATIVE_PATHS = sed \
-e 's|^ *[^ /][^ /]*/|%&|' \
-e 's| -B| -B%|g' \
@@ -711,7 +711,8 @@ PREPEND_DOTDOT_TO_RELATIVE_PATHS = sed \
-e 's|%% *|../|g' \
-e 's|%||g'
SUBDIR_FLAGS_TO_PASS = $(ORDINARY_FLAGS_TO_PASS) \
- "CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`"
+ "CC=`echo @quoted_cc_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`" \
+ "STAGE_PREFIX=`echo @stage_prefix_set_by_configure@ | $(PREPEND_DOTDOT_TO_RELATIVE_PATHS)`"
#
# Lists of files for various purposes.