diff options
author | Doug Kwan <dougkwan@google.com> | 2011-04-07 12:42:16 -0700 |
---|---|---|
committer | Android Code Review <code-review@android.com> | 2011-04-07 12:42:16 -0700 |
commit | fac2e2f3e863f49fc8a2feb2aa9fd8cfa315219c (patch) | |
tree | 4cbd5ea7dec4e1287a11902f0099af3a264182dc | |
parent | d9394eebf42aee6de56a970df3c56e67e5455545 (diff) | |
parent | 55f3c413cef5e642f05b94ada9cd2365422e8de5 (diff) | |
download | toolchain_gcc-fac2e2f3e863f49fc8a2feb2aa9fd8cfa315219c.tar.gz toolchain_gcc-fac2e2f3e863f49fc8a2feb2aa9fd8cfa315219c.tar.bz2 toolchain_gcc-fac2e2f3e863f49fc8a2feb2aa9fd8cfa315219c.zip |
Merge "xgcc compiles need to use the Android crt files as specified in LDFLAGS_FOR_TARGET"
-rw-r--r-- | gcc-4.4.3/Makefile.in | 2 | ||||
-rw-r--r-- | gcc-4.4.3/Makefile.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc-4.4.3/Makefile.in b/gcc-4.4.3/Makefile.in index 53a5146aa..c29eab7ca 100644 --- a/gcc-4.4.3/Makefile.in +++ b/gcc-4.4.3/Makefile.in @@ -466,7 +466,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@ FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@ diff --git a/gcc-4.4.3/Makefile.tpl b/gcc-4.4.3/Makefile.tpl index ac3640938..c05b93521 100644 --- a/gcc-4.4.3/Makefile.tpl +++ b/gcc-4.4.3/Makefile.tpl @@ -436,7 +436,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@ FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ DEBUG_PREFIX_CFLAGS_FOR_TARGET = @DEBUG_PREFIX_CFLAGS_FOR_TARGET@ |