From 91c1f14cb61e83f86b103d25a4104efc064d2b3b Mon Sep 17 00:00:00 2001 From: Doug Kwan Date: Mon, 9 May 2011 17:56:47 +0000 Subject: 2011-05-08 Doug Kwan Merge from gcc: 2011-05-08 Doug Kwan * configure.ac: Propagate LDFLAGS_FOR_TARGET. * configure: Regenerated. * Makefile.tpl (LDFLAGS_FOR_TARGET): Use LDFLAGS_FOR_TARGET value from configure. * Makefile.in: Regenerated. --- ChangeLog | 12 ++++++++++++ Makefile.in | 2 +- Makefile.tpl | 2 +- configure | 3 +++ configure.ac | 2 ++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84903f5..028f718 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2011-05-08 Doug Kwan + + Merge from gcc: + + 2011-05-08 Doug Kwan + + * configure.ac: Propagate LDFLAGS_FOR_TARGET. + * configure: Regenerated. + * Makefile.tpl (LDFLAGS_FOR_TARGET): Use LDFLAGS_FOR_TARGET + value from configure. + * Makefile.in: Regenerated. + 2011-05-05 Joseph Myers * configure.ac (alpha*-dec-osf*, i[[3456789]]86-*-rdos*, diff --git a/Makefile.in b/Makefile.in index 5cc0356..944839b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -541,7 +541,7 @@ CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -LDFLAGS_FOR_TARGET = +LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@ GOCFLAGS_FOR_TARGET = -O2 -g FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ diff --git a/Makefile.tpl b/Makefile.tpl index f7312d9..0b2b3d8 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -494,7 +494,7 @@ CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARGET@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates -LDFLAGS_FOR_TARGET = +LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@ GOCFLAGS_FOR_TARGET = -O2 -g FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ diff --git a/configure b/configure index cb341f9..30d6945 100755 --- a/configure +++ b/configure @@ -634,6 +634,7 @@ target_configargs host_configargs build_configargs BUILD_CONFIG +LDFLAGS_FOR_TARGET CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET DEBUG_PREFIX_CFLAGS_FOR_TARGET @@ -6625,6 +6626,8 @@ if test "x$CXXFLAGS_FOR_TARGET" = x; then fi + + # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then diff --git a/configure.ac b/configure.ac index 0ac9030..3960694 100644 --- a/configure.ac +++ b/configure.ac @@ -2110,6 +2110,8 @@ if test "x$CXXFLAGS_FOR_TARGET" = x; then fi AC_SUBST(CXXFLAGS_FOR_TARGET) +AC_SUBST(LDFLAGS_FOR_TARGET) + # Handle --with-headers=XXX. If the value is not "yes", the contents of # the named directory are copied to $(tooldir)/sys-include. if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then -- cgit v1.1