diff options
author | Kevin Cernekee <cernekee@gmail.com> | 2014-07-26 10:25:10 -0700 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-11-12 09:45:34 +0800 |
commit | 05bbbe7ab4737cc8f7c8c341a4e684bbe9cd48dc (patch) | |
tree | 81c551da36c9aaadacf89d06d6e84906e7da18f7 /build | |
parent | fc114055be9188752c0a31f3c4339ec26d2d044e (diff) | |
download | ndk-05bbbe7ab4737cc8f7c8c341a4e684bbe9cd48dc.tar.gz |
Fix make-standalone-toolchain.sh "<<<" bashism
In NDK r9d, make-standalone-toolchain.sh ran correctly with /bin/dash.
In r10, a new "here string" was introduced, and it produces the following
error:
$ dash /opt/android-ndk-r10/build/tools/make-standalone-toolchain.sh --platform=android-14 --arch=arm --install-dir=arm/toolchain
WARNING: The shell running this script isn't bash. Although we try to avoid bashism in scripts, things can happen.
Auto-config: --toolchain=arm-linux-androideabi-4.6
Copying prebuilt binaries...
Copying sysroot headers and libraries...
Copying c++ runtime headers and libraries...
/opt/android-ndk-r10/build/tools/make-standalone-toolchain.sh: 701: /opt/android-ndk-r10/build/tools/make-standalone-toolchain.sh: Syntax error: redirection unexpected
See b.android.com/74145
Change-Id: Iea77c716b3efd9425a2a6ca77160e8d66571f992
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Diffstat (limited to 'build')
-rwxr-xr-x | build/tools/make-standalone-toolchain.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/tools/make-standalone-toolchain.sh b/build/tools/make-standalone-toolchain.sh index a38a20764..9084e6a97 100755 --- a/build/tools/make-standalone-toolchain.sh +++ b/build/tools/make-standalone-toolchain.sh @@ -727,7 +727,7 @@ copy_stl_libs_for_abi () { mkdir -p "$ABI_STL_INCLUDE_TARGET" fail_panic "Can't create directory: $ABI_STL_INCLUDE_TARGET" copy_stl_common_headers -for ABI in $(tr ',' ' ' <<< $ABIS); do +for ABI in $(echo "$ABIS" | tr ',' ' '); do copy_stl_libs_for_abi "$ABI" done |