aboutsummaryrefslogtreecommitdiffstats
path: root/build-gcc.sh
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2016-02-17 00:22:19 (GMT)
committerDan Albert <danalbert@google.com>2016-02-17 00:44:52 (GMT)
commit2900925f95bf3970fdef12371600a6b65481e30c (patch)
tree9ffc7241c072333b194c7580c6203a00b539f357 /build-gcc.sh
parentedbbe53c4ffa154a5f9ae3f89ba8105993d8800e (diff)
downloadtoolchain_gcc-2900925f95bf3970fdef12371600a6b65481e30c.zip
toolchain_gcc-2900925f95bf3970fdef12371600a6b65481e30c.tar.gz
toolchain_gcc-2900925f95bf3970fdef12371600a6b65481e30c.tar.bz2
Extend the lib copying workaround for lib64.
The Windows (and probably Darwin) builds were missing the lib64 variants of libgomp.a and friends. This will still miss the libx32 libs, but we don't support that anyway. Bug: http://b/27208805 Change-Id: I19a8eb10cbedf03cba27ab5f8dc38c13c8538f25
Diffstat (limited to 'build-gcc.sh')
-rwxr-xr-xbuild-gcc.sh11
1 files changed, 9 insertions, 2 deletions
diff --git a/build-gcc.sh b/build-gcc.sh
index a964b2a..f279347 100755
--- a/build-gcc.sh
+++ b/build-gcc.sh
@@ -452,14 +452,21 @@ if [ $? != 0 ] ; then
fi
fi
+function install_missing_libs () {
+ (cd "$1" &&
+ find . \( -name "*.a" -o -name "*.la" -o -name "*.spec" \) -exec install -D "{}" "$2/{}" \;)
+}
+
if [ "$MINGW" = "yes" -o "$DARWIN" = "yes" ] ; then
# For some reasons, libraries in $ABI_CONFIGURE_TARGET (*) are not installed.
# Hack here to copy them over.
# (*) FYI: libgcc.a and libgcov.a not installed there in the first place
INSTALL_TARGET_LIB_PATH="$BUILD_OUT/host-$ABI_CONFIGURE_BUILD/install/$ABI_CONFIGURE_TARGET/lib"
TOOLCHAIN_TARGET_LIB_PATH="$TOOLCHAIN_INSTALL_PATH/$ABI_CONFIGURE_TARGET/lib"
- (cd "$INSTALL_TARGET_LIB_PATH" &&
- find . \( -name "*.a" -o -name "*.la" -o -name "*.spec" \) -exec install -D "{}" "$TOOLCHAIN_TARGET_LIB_PATH/{}" \;)
+ install_missing_libs "${INSTALL_TARGET_LIB_PATH}" "${TOOLCHAIN_TARGET_LIB_PATH}"
+ if [ -d "${INSTALL_TARGET_LIB_PATH}64" ]; then
+ install_missing_libs "${INSTALL_TARGET_LIB_PATH}64" "${TOOLCHAIN_TARGET_LIB_PATH}64"
+ fi
fi
# don't forget to copy the GPL and LGPL license files