diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-12 13:27:27 +0800 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-12 13:27:27 +0800 |
commit | 51d35f549ee27b03dc337380b4452ed20e39803b (patch) | |
tree | e7af1460048bf1d6e026374b3b1cf0d580241d13 /build | |
parent | 0c7bf1a9c8ca5d0f382d6e3bda5adb161278431b (diff) | |
download | ndk-51d35f549ee27b03dc337380b4452ed20e39803b.tar.gz |
Remove more bashisms
Change-Id: Id8d211ae7ca41276ad0a3fbd0fd31097c0d6f7e3
Diffstat (limited to 'build')
-rwxr-xr-x | build/tools/build-compiler-rt.sh | 14 | ||||
-rwxr-xr-x | build/tools/build-cxx-stl.sh | 2 | ||||
-rwxr-xr-x | build/tools/build-gnu-libstdc++.sh | 6 | ||||
-rwxr-xr-x | build/tools/build-target-prebuilts.sh | 2 | ||||
-rwxr-xr-x | build/tools/make-release.sh | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/build/tools/build-compiler-rt.sh b/build/tools/build-compiler-rt.sh index ade635bcd..8f13def08 100755 --- a/build/tools/build-compiler-rt.sh +++ b/build/tools/build-compiler-rt.sh @@ -174,13 +174,13 @@ prepare_compiler_rt_source_for_abi () local ABI=$1 local ARCH_SOURCES GENERIC_SOURCES FOUND - if [ $ABI == "armeabi" -o $ABI == "armeabi-v7a" -o $ABI == "armeabi-v7a-hard" ]; then + if [ $ABI = "armeabi" -o $ABI = "armeabi-v7a" -o $ABI = "armeabi-v7a-hard" ]; then ARCH_SOURCES="$COMPILER_RT_ARM_SOURCES" - elif [ $ABI == "x86" ]; then + elif [ $ABI = "x86" ]; then ARCH_SOURCES="$COMPILER_RT_X86_SOURCES" - elif [ $ABI == "mips" -o $ABI == "mipsr6"]; then + elif [ $ABI = "mips" -o $ABI = "mipsr6" ]; then ARCH_SOURCES="$COMPILER_RT_MIPS_SOURCES" - elif [ $ABI == "x86_64" ]; then + elif [ $ABI = "x86_64" ]; then ARCH_SOURCES="$COMPILER_RT_X86_64_SOURCES" fi @@ -238,15 +238,15 @@ build_compiler_rt_libs_for_abi () builder_cflags "$COMPILER_RT_CFLAGS" - if [ $ABI == "armeabi" -o $ABI == "armeabi-v7a" -o $ABI == "armeabi-v7a-hard" ]; then + if [ $ABI = "armeabi" -o $ABI = "armeabi-v7a" -o $ABI = "armeabi-v7a-hard" ]; then builder_cflags "-D__ARM_EABI__" - if [ $ABI == "armeabi-v7a-hard" ]; then + if [ $ABI = "armeabi-v7a-hard" ]; then builder_cflags "-mhard-float -D_NDK_MATH_NO_SOFTFP=1" fi fi builder_ldflags "$COMPILER_RT_LDFLAGS" - if [ $ABI == "armeabi-v7a-hard" ]; then + if [ $ABI = "armeabi-v7a-hard" ]; then builder_cflags "-Wl,--no-warn-mismatch -lm_hard" fi diff --git a/build/tools/build-cxx-stl.sh b/build/tools/build-cxx-stl.sh index fe0d65e55..cd5f27e27 100755 --- a/build/tools/build-cxx-stl.sh +++ b/build/tools/build-cxx-stl.sh @@ -625,7 +625,7 @@ build_stl_libs_for_abi () builder_cxxflags "$DEFAULT_CXXFLAGS $CXX_STL_CXXFLAGS $EXTRA_CXXFLAGS" builder_ldflags "$CXX_STL_LDFLAGS $EXTRA_LDFLAGS" builder_sources $CXX_STL_SOURCES - if [ "$CXX_SUPPORT_LIB" == "libc++abi" ]; then + if [ "$CXX_SUPPORT_LIB" = "libc++abi" ]; then builder_sources $LIBCXXABI_SOURCES builder_ldflags "-ldl" fi diff --git a/build/tools/build-gnu-libstdc++.sh b/build/tools/build-gnu-libstdc++.sh index f89f1d903..397a1d34c 100755 --- a/build/tools/build-gnu-libstdc++.sh +++ b/build/tools/build-gnu-libstdc++.sh @@ -255,9 +255,9 @@ build_gnustl_for_abi () #LDFLAGS=$LDFLAGS" -lsupc++" fi - if [ "$ARCH" == "x86_64" -o "$ARCH" == "mips64" -o "$ARCH" == "mips" ] ; then + if [ "$ARCH" = "x86_64" -o "$ARCH" = "mips64" -o "$ARCH" = "mips" ] ; then MULTILIB_FLAGS= - elif [ "$ARCH" == "mips" -a $GCC_VERSION == "4.9" ] ; then + elif [ "$ARCH" = "mips" -a $GCC_VERSION = "4.9" ] ; then MULTILIB_FLAGS= else MULTILIB_FLAGS=--disable-multilib @@ -444,7 +444,7 @@ if [ -n "$PACKAGE_DIR" ] ; then lib64r2/libsupc++.a lib64r2/libgnustl_static.a lib64r2/libgnustl_shared.so" ;; mips|mipsr6) - if [ "$VERSION" == "4.9" ]; then + if [ "$VERSION" = "4.9" ]; then MULTILIB="include/mips-r2/bits include/mips-r6/bits include/bits lib/libsupc++.a lib/libgnustl_static.a lib/libgnustl_shared.so libr2/libsupc++.a libr2/libgnustl_static.a libr2/libgnustl_shared.so diff --git a/build/tools/build-target-prebuilts.sh b/build/tools/build-target-prebuilts.sh index db25bdf38..e712be5b9 100755 --- a/build/tools/build-target-prebuilts.sh +++ b/build/tools/build-target-prebuilts.sh @@ -133,7 +133,7 @@ fi # First, gdbserver for ARCH in $ARCHS; do - if [ "$GCC_VERSION" == "default" ]; then + if [ "$GCC_VERSION" = "default" ]; then GDB_TOOLCHAIN=$(get_default_toolchain_name_for_arch $ARCH) elif [ ! -z "$GCC_VERSION" ]; then GDB_TOOLCHAIN=$(get_toolchain_name_for_arch $ARCH $GCC_VERSION) diff --git a/build/tools/make-release.sh b/build/tools/make-release.sh index cc2ae67eb..62e2c6e22 100755 --- a/build/tools/make-release.sh +++ b/build/tools/make-release.sh @@ -62,7 +62,7 @@ HOST_SYSTEMS="$HOST_TAG32" MINGW_GCC= CANADIAN_DARWIN_BUILD=no -if [ "$HOST_TAG" == "linux-x86" ] ; then +if [ "$HOST_TAG" = "linux-x86" ] ; then find_mingw_toolchain if [ -n "$MINGW_GCC" ] ; then HOST_SYSTEMS="$HOST_SYSTEMS,windows" |