Benjamin Kosnik writes:
> On Sun, 12 Jan 2003 11:25:04 +0100
> Matthias Klose <[EMAIL PROTECTED]> wrote:
>
> >Is it likely this will be addressed in the gcc-3.2 branch?
>
> Are you volunteering?
Ryan Murray provided a patch, which I attach here. Needed for the 3.3
branch as well. checked on mips{,el}-linux and i386-linux only.
The patch touches a few Makefile.am's to remove the
--tag option to libtool (doesn't exist), and then uses autoreconf on the
subdirs, and copies in things to the top level.
gnu automake....)
After applying the patch:
libtoolize --force --copy
cp /usr/share/aclocal/libtool.m4 . # (from libtool-1.4.3)
for i in libf2c libjava/libltdl libobjc libstdc++-v3 zlib; do
(cd ${i} ; autoreconf --force)
done
--- libstdc++-v3/libmath/Makefile.am 2002-09-12 22:25:57.000000000 -0700
+++ libstdc++-v3/libmath/Makefile.am 2003-01-22 03:00:53.000000000 -0800
@@ -40,5 +40,3 @@
INCLUDES = \
$(TOPLEVEL_INCLUDES)
-# Only compiling "C" sources in this directory.
-LIBTOOL = @LIBTOOL@ --tag CC
\ No newline at end of file
--- libstdc++-v3/libsupc++/Makefile.am 2003-01-22 03:27:55.000000000 -0800
+++ libstdc++-v3/libsupc++/Makefile.am 2003-01-22 04:13:44.000000000 -0800
@@ -125,7 +125,7 @@
$(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
# LTCOMPILE is copied from LTCXXCOMPILE below.
-LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) \
$(DEFS) $(GCC_INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
@@ -166,7 +166,7 @@
#
# We have to put --tag disable-shared after --tag CXX lest things
# CXX undo the affect of disable-shared.
-LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \
+LTCXXCOMPILE = $(LIBTOOL) \
--mode=compile $(CXX) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
@@ -176,7 +176,7 @@
# course is problematic at this point. So, we get the top-level
# directory to configure libstdc++-v3 to use gcc as the C++
# compilation driver.
-CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \
+CXXLINK = $(LIBTOOL) \
--mode=link $(CXX) \
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
--- libstdc++-v3/src/Makefile.am 2003-01-22 04:30:51.000000000 -0800
+++ libstdc++-v3/src/Makefile.am 2003-01-22 05:04:05.000000000 -0800
@@ -177,7 +177,7 @@
# correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
# CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
# attempt to infer which configuration to use
-LTCXXCOMPILE = $(LIBTOOL) --tag CXX --mode=compile $(CXX) $(INCLUDES) \
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
# 3) We'd have a problem when building the shared libstdc++ object if
@@ -186,7 +186,7 @@
# course is problematic at this point. So, we get the top-level
# directory to configure libstdc++-v3 to use gcc as the C++
# compilation driver.
-CXXLINK = $(LIBTOOL) --tag CXX --mode=link $(CXX) \
+CXXLINK = $(LIBTOOL) --mode=link $(CXX) \
@OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
install-exec-local:
--- libjava/Makefile.am 2003-01-22 05:09:24.000000000 -0800
+++ libjava/Makefile.am 2003-01-22 05:12:36.000000000 -0800
@@ -71,15 +71,15 @@
## compiles.
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8
-GCJCOMPILE = $(LIBTOOL) --tag=GCJ --mode=compile $(GCJ_WITH_FLAGS)
-fclasspath= -fbootclasspath=$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
-GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS)
$(LDFLAGS) -o $@
-LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS)
$(LDFLAGS) -o $@
+GCJCOMPILE = $(LIBTOOL) --mode=compile $(GCJ_WITH_FLAGS) -fclasspath=
-fbootclasspath=$(here) $(JC1FLAGS) -MD -MT $@ -MF $(@:.lo=.d) -c
+GCJLINK = $(LIBTOOL) --mode=link $(GCJ) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
+LIBLINK = $(LIBTOOL) --mode=link $(CXX) -L$(here) $(JC1FLAGS) $(LDFLAGS) -o $@
## We define this because otherwise libtool can be run with different
## values of `CXX' and will then get confused and fail to work. So,
## we use --tag explicitly. Someday automake will be changed to do
## this automatically.
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
JAVAC = $(GCJ_WITH_FLAGS) -C
--- libstdc++-v3/testsuite/Makefile.am 2002-09-05 22:20:47.000000000 -0700
+++ libstdc++-v3/testsuite/Makefile.am 2003-01-22 05:14:50.000000000 -0800
@@ -41,7 +41,7 @@
CXX=`echo $(CXX_fake) | sed 's/xgcc/g++/g'`
CXXLINK = \
LD_RUN_PATH=${LD_RUN_PATH:+$LD_RUN_PATH:}${glibcpp_builddir}/src/.libs\
- $(LIBTOOL) --tag=CXX --mode=link $(CXX) \
+ $(LIBTOOL) --mode=link $(CXX) \
$(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
INCLUDES = \
