aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2002-08-20 03:04:03 +0000
committerAlexandre Oliva <aoliva@redhat.com>2002-08-20 03:04:03 +0000
commita08bafb59bce834786c3510578849f38652efea3 (patch)
tree25a39e8c399c9c9adb8618cc33e5e4d7f51d0033
parentf5126dd7c3a605d9210aa040e7c715aba26b9fc6 (diff)
downloadgdb-a08bafb59bce834786c3510578849f38652efea3.zip
gdb-a08bafb59bce834786c3510578849f38652efea3.tar.gz
gdb-a08bafb59bce834786c3510578849f38652efea3.tar.bz2
* Makefile.in (GCC_FOR_TARGET): Prepend STAGE_CC_WRAPPER.
* configure.in (CC_FOR_TARGET, GCJ_FOR_TARGET, CXX_FOR_TARGET, CXX_FOR_TARGET_FOR_RECURSIVE_MAKE): Likewise.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in2
-rw-r--r--configure.in8
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e98ebb..02249cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-20 Alexandre Oliva <aoliva@redhat.com>
+
+ * Makefile.in (GCC_FOR_TARGET): Prepend STAGE_CC_WRAPPER.
+ * configure.in (CC_FOR_TARGET, GCJ_FOR_TARGET, CXX_FOR_TARGET,
+ CXX_FOR_TARGET_FOR_RECURSIVE_MAKE): Likewise.
+
2002-08-06 Federico G. Schwindt <fgsch@olimpo.com.br>
* configure.in (hppa*-*-openbsd*): Treat like hppa*-*-*elf*.
diff --git a/Makefile.in b/Makefile.in
index c3caa1d..c37a505 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -251,7 +251,7 @@ GCJ_FOR_TARGET =
# variable is passed down to the gcc Makefile, where it is used to
# build libgcc2.a. We define it here so that it can itself be
# overridden on the command line.
-GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET)
+GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET)
AS_FOR_TARGET = ` \
if [ -f $$r/gas/as-new ] ; then \
diff --git a/configure.in b/configure.in
index 36bdf20..a945dcb 100644
--- a/configure.in
+++ b/configure.in
@@ -1554,10 +1554,10 @@ cat >$sedtemp <<EOF
s:^TARGET_CONFIGDIRS[ ]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:
s%^TARGET_CONFIGARGS[ ]*=.*$%TARGET_CONFIGARGS = ${targargs}%
s%^FLAGS_FOR_TARGET[ ]*=.*$%FLAGS_FOR_TARGET = ${FLAGS_FOR_TARGET}%
-s%^CC_FOR_TARGET[ ]*=.*$%CC_FOR_TARGET = ${CC_FOR_TARGET}%
-s%^GCJ_FOR_TARGET[ ]*=.*$%GCJ_FOR_TARGET = ${GCJ_FOR_TARGET}%
-s%^CXX_FOR_TARGET[ ]*=.*$%CXX_FOR_TARGET = ${qCXX_FOR_TARGET}%
-s%^CXX_FOR_TARGET_FOR_RECURSIVE_MAKE[ ]*=.*$%CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = ${qqCXX_FOR_TARGET}%
+s%^CC_FOR_TARGET[ ]*=.*$%CC_FOR_TARGET = \$(STAGE_CC_WRAPPER) ${CC_FOR_TARGET}%
+s%^GCJ_FOR_TARGET[ ]*=.*$%GCJ_FOR_TARGET = \$(STAGE_CC_WRAPPER) ${GCJ_FOR_TARGET}%
+s%^CXX_FOR_TARGET[ ]*=.*$%CXX_FOR_TARGET = \$(STAGE_CC_WRAPPER) ${qCXX_FOR_TARGET}%
+s%^CXX_FOR_TARGET_FOR_RECURSIVE_MAKE[ ]*=.*$%CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = \$(STAGE_CC_WRAPPER) ${qqCXX_FOR_TARGET}%
s%^TARGET_SUBDIR[ ]*=.*$%TARGET_SUBDIR = ${target_subdir}%
s%^BUILD_SUBDIR[ ]*=.*$%BUILD_SUBDIR = ${build_subdir}%
s%^BUILD_CONFIGARGS[ ]*=.*$%BUILD_CONFIGARGS = ${buildargs}%