This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
3.5 PATCH: Fix libcpp related build problems
- From: Rainer Orth <ro at TechFak dot Uni-Bielefeld dot DE>
- To: gcc-patches at gcc dot gnu dot org
- Date: Mon, 24 May 2004 19:01:07 +0200 (MEST)
- Subject: 3.5 PATCH: Fix libcpp related build problems
A mainline bootstrap on mips-sgi-irix6.5 just failed since fix-headers
failed to link. While LIBS included CPPLIB, only CPPLIBS was defined.
Besides, CPPLIB needs to come before LIBIBERTY on the link line, since
libcpp depends on several libiberty functions.
The following patch fixes this and allows the bootstrap to continue.
Ok for mainline?
Rainer
-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University
Mon May 24 17:28:08 2004 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile.in (CPPLIBS): Renamed to CPPLIB.
(BACKEND): Reflect this.
(LIBDEPS): Move CPPLIB before LIBIBERTY.
(LIBS): Likewise.
--- Makefile.in Mon May 24 15:05:28 2004
+++ Makefile.in.fixed Mon May 24 18:46:43 2004
@@ -285,7 +285,7 @@ GMPINC = @GMPINC@
BANSHEELIB = @BANSHEELIB@
BANSHEEINC = @BANSHEEINC@
-CPPLIBS = ../libcpp/libcpp.a
+CPPLIB = ../libcpp/libcpp.a
CPPINC = -I$(srcdir)/../libcpp/include
# Substitution type for target's getgroups 2nd arg.
@@ -739,7 +739,7 @@ LIBIBERTY = ../libiberty/libiberty.a
BUILD_LIBIBERTY = @FORBUILD@/libiberty/libiberty.a
# Dependencies on the intl and portability libraries.
-LIBDEPS= $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP) $(CPPLIB) $(BANSHEELIB)
+LIBDEPS= $(CPPLIB) $(LIBIBERTY) $(LIBINTL_DEP) $(LIBICONV_DEP) $(BANSHEELIB)
# Likewise, for use in the tools that must run on this machine
# even if we are cross-building GCC.
@@ -747,7 +747,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
# How to link with both our special library facilities
# and the system's installed libraries.
-LIBS = @LIBS@ $(LIBIBERTY) $(LIBINTL) $(LIBICONV) $(CPPLIB) $(BANSHEELIB)
+LIBS = @LIBS@ $(CPPLIB) $(LIBIBERTY) $(LIBINTL) $(LIBICONV) $(BANSHEELIB)
# Any system libraries needed just for GNAT.
SYSLIBS = @GNAT_LIBEXC@
@@ -913,7 +913,7 @@ OBJS = $(OBJS-common) $(out_object_file)
OBJS-onestep = libbackend.o $(OBJS-archive)
-BACKEND = main.o @TREEBROWSER@ libbackend.a $(CPPLIBS)
+BACKEND = main.o @TREEBROWSER@ libbackend.a $(CPPLIB)
# Files to be copied away after each stage in building.
STAGESTUFF = *$(objext) insn-flags.h insn-config.h insn-codes.h \