From 84fec8a53729e1cc4a4243d10575285a4138cfe3 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 22 Aug 2009 12:43:24 +0000 Subject: LIBTOOLFLAGS, and *_LINK fixes for Automake 1.11 boehm-gc/: * Makefile.am (LTCOMPILE, LTLINK): Add $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). * Makefile.in: Regenerate. libgfortran/: * Makefile.am (libgfortran_la_LINK): Add $(libgfortran_la_LDFLAGS). * Makefile.in: Regenerate. libjava/: * Makefile.am (libgcj_la_LINK, libgcj_tools_la_LINK) (lib_gnu_awt_xlib_la_LINK, libgcj_bc_la_LINK, jv_convert_LINK) (gcj_dbtool_LINK, gc_analyze_LINK, gij_LINK, ecjx_LINK) (gappletviewer_LINK, gjarsigner_LINK, gkeytool_LINK) (gjar_LINK, gjavah_LINK, gcjh_LINK, gnative2ascii_LINK) (gorbd_LINK, grmid_LINK, gserialver_LINK, gtnameserv_LINK) (grmic_LINK, grmiregistry_LINK, gjdoc_LINK): Add $(gjdoc_LDFLAGS). (GCJLINK, LIBLINK, CXXLINK): Add $(LIBTOOLFLAGS). * Makefile.in: Regenerate. libstdc++-v3/: * libsupc++/Makefile.am (LTCOMPILE, LTCXXCOMPILE, CXXLINK): Add $(LIBTOOLFLAGS). * libsupc++/Makefile.in: Regenerate. * src/Makefile.am (LTCXXCOMPILE, CXXLINK): Add $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). * src/Makefile.in: Regenerate. libgomp/: * Makefile.am (LINK): Add $(AM_LIBTOOLFLAGS) and $(LIBTOOLFLAGS). * Makefile.in: Regenerate. libobjc/: * Makefile.in (LIBTOOL): Add $(LIBTOOLFLAGS). From-SVN: r151013 --- libstdc++-v3/libsupc++/Makefile.am | 8 ++++---- libstdc++-v3/libsupc++/Makefile.in | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libstdc++-v3/libsupc++') diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index b84b5e4..d012da9 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -116,8 +116,8 @@ C_COMPILE = \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) # LTCOMPILE is copied from LTCXXCOMPILE below. -LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \ - $(DEFS) $(C_INCLUDES) $(LIBSUPCXX_PICFLAGS) \ +LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(LIBTOOLFLAGS) \ + $(CC) $(DEFS) $(C_INCLUDES) $(LIBSUPCXX_PICFLAGS) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) cp-demangle.c: @@ -150,7 +150,7 @@ cp-demangle.o: cp-demangle.c # # 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) --tag CXX --tag disable-shared $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -162,7 +162,7 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) # 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) --tag CXX --tag disable-shared $(LIBTOOLFLAGS) \ --mode=link $(CXX) \ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@ diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 50ede6a..aca6187 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -448,8 +448,8 @@ C_COMPILE = \ # LTCOMPILE is copied from LTCXXCOMPILE below. -LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \ - $(DEFS) $(C_INCLUDES) $(LIBSUPCXX_PICFLAGS) \ +LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(LIBTOOLFLAGS) \ + $(CC) $(DEFS) $(C_INCLUDES) $(LIBSUPCXX_PICFLAGS) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -474,7 +474,7 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared --mode=compile $(CC) \ # # 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) --tag CXX --tag disable-shared $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -486,7 +486,7 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) # 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) --tag CXX --tag disable-shared $(LIBTOOLFLAGS) \ --mode=link $(CXX) \ $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@ -- cgit v1.1