diff options
| author |  mtklein <mtklein@chromium.org> | 2016-07-11 10:30:19 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-11 10:30:19 -0700 |
| commit | f3bc76a12af0f07c00e154a7288a60882a375f64 (patch) | |
| tree | bf5906f1ce4daf905032fcd011e003f8b4d6dcb1 /platform_tools | |
| parent | 63d14413beab9806a65267dcf1a3e77e4bb566d1 (diff) | |
Fix MIPS32r2 + DSP2 builders after NDK update.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2141643002
TBR=djsollen@google.com
CQ_INCLUDE_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-MipsDSP2-Debug-Android-Trybot,Build-Ubuntu-GCC-MipsDSP2-Release-Android-Trybot
Review-Url: https://codereview.chromium.org/2141643002
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/utils/setup_toolchain.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/platform_tools/android/bin/utils/setup_toolchain.sh b/platform_tools/android/bin/utils/setup_toolchain.sh index ebeab27a50..c341c2e341 100755 --- a/platform_tools/android/bin/utils/setup_toolchain.sh +++ b/platform_tools/android/bin/utils/setup_toolchain.sh @@ -144,6 +144,15 @@ else exportVar STRIP "$ANDROID_TOOLCHAIN_PREFIX-strip" fi +# GCC doesn't seem to put this on its include path when setting -march=mips32r2. +# Oddly, it does for mips32, mips32r3, and mips32r5, but it's gone again for mips32r6. +# Clang's fine. +if [ "$USE_CLANG" != "true" ]; then + if [ "$ANDROID_ARCH" == "mips" ]; then + exportVar CXX_target "$CXX_target -isystem $ANDROID_TOOLCHAIN/include/c++/4.9.x/mipsel-linux-android" + fi +fi + # Create symlinks for nm & readelf and add them to the path so that the ninja # build uses them instead of attempting to use the one on the system. # This is required to build using ninja on a Mac. |