diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-11-17 10:06:59 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-02 09:18:57 +0800 |
| commit | 01a3a139b7a1bd03e874cfd2107b791cb1c505fb (patch) | |
| tree | 0fa0e72d7a125942dfbb4da565cdc9f9a977de37 /build/core/default-build-commands.mk | |
| parent | e505b304e02af3423a69735bb86fd1288a3641b4 (diff) | |
| download | ndk-01a3a139b7a1bd03e874cfd2107b791cb1c505fb.tar.gz | |
Set GCC 4.8 as the default for 32-bit ABIs
Add get_first_gcc_version_for_arch and set to GCC 4.6 for 32-bit ABIs
while it's still around (deprecated but will be removed in 1-2 release)
Change-Id: I035c3b46ffb6c5aacf92893b920623acbae1719c
Diffstat (limited to 'build/core/default-build-commands.mk')
| -rw-r--r-- | build/core/default-build-commands.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/core/default-build-commands.mk b/build/core/default-build-commands.mk index ee88037cb..34653307c 100644 --- a/build/core/default-build-commands.mk +++ b/build/core/default-build-commands.mk @@ -148,12 +148,12 @@ TARGET_ASMFLAGS = TARGET_LD = $(TOOLCHAIN_PREFIX)ld TARGET_LDFLAGS := -TARGET_AR = $(TOOLCHAIN_PREFIX)ar -# Use *-gcc-ar instead of *-ar for better LTO support -ifneq (,$(NDK_TOOLCHAIN_VERSION)) +# Use *-gcc-ar instead of *-ar for better LTO support, except for +# gcc4.6 which doesn't have gcc-ar ifneq (4.6,$(NDK_TOOLCHAIN_VERSION)) TARGET_AR = $(TOOLCHAIN_PREFIX)gcc-ar -endif +else +TARGET_AR = $(TOOLCHAIN_PREFIX)ar endif TARGET_ARFLAGS := crsD |