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 /tests | |
| 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 'tests')
| -rwxr-xr-x | tests/run-tests-all.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/run-tests-all.sh b/tests/run-tests-all.sh index 482cc3191..c08f42ab0 100755 --- a/tests/run-tests-all.sh +++ b/tests/run-tests-all.sh @@ -186,11 +186,11 @@ for ARCH in $(commas_to_spaces $DEFAULT_ARCHS); do else API=$API64 fi - DEFAULT_GCC_VERSION=$(get_default_gcc_version_for_arch $ARCH) + FIRST_GCC_VERSION=$(get_first_gcc_version_for_arch $ARCH) MAKE_IT= for GCC_VERSION in $(commas_to_spaces $DEFAULT_GCC_VERSION_LIST); do - # Only process GCC_VERSION from DEFAULT_GCC_VERSION - if [ -z "$MAKE_IT" -a "$GCC_VERSION" = "$DEFAULT_GCC_VERSION" ]; then + # Only process GCC_VERSION from FIRST_GCC_VERSION + if [ -z "$MAKE_IT" -a "$GCC_VERSION" = "$FIRST_GCC_VERSION" ]; then MAKE_IT=yes fi if [ -z "$MAKE_IT" ]; then |