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/setup-toolchain.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/setup-toolchain.mk')
| -rw-r--r-- | build/core/setup-toolchain.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/core/setup-toolchain.mk b/build/core/setup-toolchain.mk index 93fa85770..243df3fbf 100644 --- a/build/core/setup-toolchain.mk +++ b/build/core/setup-toolchain.mk @@ -36,8 +36,8 @@ ifndef NDK_TOOLCHAIN $(filter-out %-clang$(_ver),$(TARGET_TOOLCHAIN_LIST)))) ifeq (,$(findstring 64,$(TARGET_ARCH_ABI))) - # Filter out 4.7, 4.8 and 4.9 which are newer than the defaultat this moment - __filtered_toolchain_list := $(filter-out %4.7 %4.8 %4.8l %4.9 %4.9l,$(TARGET_TOOLCHAIN_LIST)) + # Filter out 4.6 and 4.7 which are deprecated + __filtered_toolchain_list := $(filter-out %4.6 %4.7,$(TARGET_TOOLCHAIN_LIST)) ifdef __filtered_toolchain_list TARGET_TOOLCHAIN_LIST := $(__filtered_toolchain_list) endif |