diff options
| author | Doug Kwan <dougkwan@google.com> | 2011-05-09 21:56:47 +0400 |
|---|---|---|
| committer | Doug Kwan <dougkwan@google.com> | 2011-05-09 21:56:47 +0400 |
| commit | 2e7bf520ebfff6e87deecaf338f298e0a2d2099c (patch) | |
| tree | a295cad71d73153ea1784ab0f9440368dc00eeb4 | |
| parent | 481ff3f38653629f51c2fb0947c3defef00925bc (diff) | |
2011-05-08 Doug Kwan <dougkwan@google.com>
Merge from gcc:
2011-05-08 Doug Kwan <dougkwan@google.com>
* configure.ac: Propagate LDFLAGS_FOR_TARGET.
* configure: Regenerated.
* Makefile.tpl (LDFLAGS_FOR_TARGET): Use LDFLAGS_FOR_TARGET
value from configure.
* Makefile.in: Regenerated.
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Makefile.tpl | 2 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.ac | 2 |
5 files changed, 19 insertions, 2 deletions
@@ -1,3 +1,15 @@ +2011-05-08 Doug Kwan <dougkwan@google.com> + + Merge from gcc: + + 2011-05-08 Doug Kwan <dougkwan@google.com> + + * 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 <joseph@codesourcery.com> * configure.ac (alpha*-dec-osf*, i[[3456789]]86-*-rdos*, diff --git a/Makefile.in b/Makefile.in index 5cc03562a..944839b6b 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 f7312d9e8..0b2b3d898 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@ @@ -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 0ac903055..39606948e 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 |