diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-30 06:32:27 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-30 06:32:29 +0000 |
commit | 10aa0b925a76d50e5e504ab2f4f0a97ee17a32e0 (patch) | |
tree | 2cb772299811f73c5d28c66438ee546559468637 | |
parent | e94c46815ff1719ac4637a60b624815f0ff065d4 (diff) | |
parent | 6036ad7d3eb82332ebbf9e4ca300c6176c4e8a0a (diff) | |
download | ndk-10aa0b925a76d50e5e504ab2f4f0a97ee17a32e0.tar.gz |
Merge "Fix abcc build broken."
-rwxr-xr-x | build/tools/build-device-llvm.sh | 10 | ||||
-rw-r--r-- | build/tools/prebuilt-common.sh | 2 | ||||
-rw-r--r-- | toolchains/llvm-3.5/setup.mk | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/build/tools/build-device-llvm.sh b/build/tools/build-device-llvm.sh index f1f0a9d15..9e04f3140 100755 --- a/build/tools/build-device-llvm.sh +++ b/build/tools/build-device-llvm.sh @@ -47,7 +47,7 @@ register_var_option "--abis=<armeabi,armeabi-v7a,x86,mips,armeabi-v7a-hard>" OPT OPTION_GCC_VERSION= register_var_option "--gcc-version=<version>" OPTION_GCC_VERSION "Specify GCC toolchain version [Default: $DEFAULT_GCC_VERSION]" -STL=stlport +STL=gnustl register_var_option "--stl=<name>" STL "Specify C++ STL" SHARED= @@ -185,7 +185,7 @@ for abi in $ABIS; do --stl=$STL \ --arch=$arch \ --system=$HOST_TAG \ - --platform=android-19 \ + --platform=android-21 \ --install-dir=$BUILD_OUT/ndk-standalone-$arch fail_panic "Couldn't make standalone for $arch" @@ -266,11 +266,7 @@ for abi in $ABIS; do fail_panic "Couldn't compile mclinker" run mkdir -p $TOOLCHAIN_BUILD_PREFIX/$abi - if [ -f $MCLINKER_BUILD_OUT/tools/lite/ld.lite ]; then - run cp -f $MCLINKER_BUILD_OUT/tools/lite/ld.lite $TOOLCHAIN_BUILD_PREFIX/$abi/ld.mcld - else - run cp -f $MCLINKER_BUILD_OUT/optimized/ld.mcld $TOOLCHAIN_BUILD_PREFIX/$abi - fi + run cp -f $MCLINKER_BUILD_OUT/tools/mcld/ld.mcld $TOOLCHAIN_BUILD_PREFIX/$abi fail_panic "Couldn't copy mclinker" # Strip diff --git a/build/tools/prebuilt-common.sh b/build/tools/prebuilt-common.sh index 9c7c75ad3..f84e36033 100644 --- a/build/tools/prebuilt-common.sh +++ b/build/tools/prebuilt-common.sh @@ -1498,7 +1498,7 @@ get_default_libdir_for_abi () mipsr6) echo "libr6" ;; *) local ARCH=$(convert_abi_to_arch $1) - $(get_default_libdir_for_arch $ARCH) + echo "$(get_default_libdir_for_arch $ARCH)" ;; esac } diff --git a/toolchains/llvm-3.5/setup.mk b/toolchains/llvm-3.5/setup.mk index 8d84e9053..80cf10986 100644 --- a/toolchains/llvm-3.5/setup.mk +++ b/toolchains/llvm-3.5/setup.mk @@ -23,7 +23,7 @@ # revisions of the NDK. # -TOOLCHAIN_VERSION := 4.8 +TOOLCHAIN_VERSION := 4.9 ifneq ($(filter %bcarmeabi-v7a,$(TARGET_ARCH_ABI)),) SYSROOT_LINK := $(NDK_PLATFORMS_ROOT)/$(TARGET_PLATFORM)/arch-arm |