aboutsummaryrefslogtreecommitdiffstats
path: root/build-gcc.sh
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-08-25 22:40:42 (GMT)
committerDan Albert <danalbert@google.com>2015-08-27 21:41:30 (GMT)
commitdc03ff1e85fb2d7a8100953d352c58c41a4147cf (patch)
tree14634ec11430e9986cc409abd4ed683c8f125a35 /build-gcc.sh
parentaa671cf788ff28a6694ec78cf88b06e2647649e5 (diff)
downloadtoolchain_gcc-dc03ff1e85fb2d7a8100953d352c58c41a4147cf.zip
toolchain_gcc-dc03ff1e85fb2d7a8100953d352c58c41a4147cf.tar.gz
toolchain_gcc-dc03ff1e85fb2d7a8100953d352c58c41a4147cf.tar.bz2
Only package gccunwind for Linux.
We should be doing this for the others, but there are still some build issues to work out. Note that this change was made to ndk/, but that was done after I had copied build-gcc.sh here and I mistakenly forgot to apply it here as well. Change-Id: I2289c9d4da41eee8ce1d75324ccabf30adb7bd01 (cherry picked from commit da6ed85636572e47535ffd4fe6ab4790921c6508)
Diffstat (limited to 'build-gcc.sh')
-rwxr-xr-xbuild-gcc.sh18
1 files changed, 10 insertions, 8 deletions
diff --git a/build-gcc.sh b/build-gcc.sh
index b80ca0d..56b7831 100755
--- a/build-gcc.sh
+++ b/build-gcc.sh
@@ -644,14 +644,16 @@ if [ "$PACKAGE_DIR" ]; then
pack_archive "$PACKAGE_DIR/$ARCHIVE" "$NDK_DIR" "$SUBDIR"
# package libgccunwind.a
ABIS=$(commas_to_spaces $(convert_archs_to_abis $ARCH))
- for ABI in $ABIS; do
- FILES="$PACKAGE_DIR/$GCCUNWIND_SUBDIR/libs/$ABI/libgccunwind.a"
- PACKAGE="$PACKAGE_DIR/libgccunwind-libs-$ABI.tar.bz2"
- log "Packaging: $PACKAGE"
- pack_archive "$PACKAGE" "$NDK_DIR" "$FILES"
- fail_panic "Could not package $ABI libgccunwind binaries!"
- dump "Packaging: $PACKAGE"
- done
+ if [ "$HOST_OS" = "linux" -a "$GCC_VERSION" = "$DEFAULT_GCC_VERSION" ]; then
+ for ABI in $ABIS; do
+ FILES="$PACKAGE_DIR/$GCCUNWIND_SUBDIR/libs/$ABI/libgccunwind.a"
+ PACKAGE="$PACKAGE_DIR/libgccunwind-libs-$ABI.tar.bz2"
+ log "Packaging: $PACKAGE"
+ pack_archive "$PACKAGE" "$NDK_DIR" "$FILES"
+ fail_panic "Could not package $ABI libgccunwind binaries!"
+ dump "Packaging: $PACKAGE"
+ done
+ fi
fi
dump "Done."