diff options
| author | Lai Wei-Chih <Robert.Lai@mediatek.com> | 2014-12-30 13:11:15 +0800 |
|---|---|---|
| committer | Lai Wei-Chih <Robert.Lai@mediatek.com> | 2014-12-30 13:48:31 +0800 |
| commit | 6036ad7d3eb82332ebbf9e4ca300c6176c4e8a0a (patch) | |
| tree | 2cb772299811f73c5d28c66438ee546559468637 /build | |
| parent | e94c46815ff1719ac4637a60b624815f0ff065d4 (diff) | |
| download | ndk-6036ad7d3eb82332ebbf9e4ca300c6176c4e8a0a.tar.gz | |
Fix abcc build broken.
Fix build broken for abcc and use gcc-4.9 to
compile 32bit/64bit device toolchains.
Change-Id: If0a1054a6379a86e01659af0f539fb45b6a36330
Diffstat (limited to 'build')
| -rwxr-xr-x | build/tools/build-device-llvm.sh | 10 | ||||
| -rw-r--r-- | build/tools/prebuilt-common.sh | 2 |
2 files changed, 4 insertions, 8 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 } |