diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-19 11:51:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-19 11:51:36 +0000 |
| commit | 3777a0a63319e51adc66b8124d350f447ada3ade (patch) | |
| tree | d1c677a3fa8e5c9cbe08fc6b75613a67da35a8fd | |
| parent | 9cd9ac209dcc5406bc580779487bd7858faaa1ae (diff) | |
| parent | 0589ebcfd95017f6c896bfe3903379c5861665e2 (diff) | |
| download | ndk-3777a0a63319e51adc66b8124d350f447ada3ade.tar.gz | |
Merge "Don't build libc++abi on unknown arch due to assembly file."
| -rwxr-xr-x | build/tools/build-target-prebuilts.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/tools/build-target-prebuilts.sh b/build/tools/build-target-prebuilts.sh index e712be5b9..7705ee347 100755 --- a/build/tools/build-target-prebuilts.sh +++ b/build/tools/build-target-prebuilts.sh @@ -162,8 +162,8 @@ dump "Building $ABIS $UNKNOWN_ABIS stlport binaries..." run $BUILDTOOLS/build-cxx-stl.sh --stl=stlport --abis="$ABIS,$UNKNOWN_ABIS" $FLAGS --with-debug-info $BUILD_TOOLCHAIN fail_panic "Could not build stlport with debug info!" -dump "Building $ABIS $UNKNOWN_ABIS libc++ binaries... with libc++abi" -run $BUILDTOOLS/build-cxx-stl.sh --stl=libc++-libc++abi --abis="$ABIS,$UNKNOWN_ABIS" $FLAGS --with-debug-info $BUILD_TOOLCHAIN +dump "Building $ABIS libc++ binaries... with libc++abi" +run $BUILDTOOLS/build-cxx-stl.sh --stl=libc++-libc++abi --abis="$ABIS" $FLAGS --with-debug-info $BUILD_TOOLCHAIN fail_panic "Could not build libc++ with libc++abi and debug info!" # workaround issues in libc++/libc++abi for x86 and mips |