Merge pull request #60 from donbright/patch-2

Fix broken --no-ppc --no-carbon build in build-toolchain.bash
This commit is contained in:
Wolfgang Thaller 2018-07-18 23:28:15 +02:00 committed by GitHub
commit 7d107bba49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -516,11 +516,12 @@ for arch in $ARCHS; do
"$PREFIX/bin/${arch}-apple-macos-ar" cqs "$PREFIX/${arch}-apple-macos/lib/libretrocrt.a"
fi
done
if [ ! -e "$PREFIX/powerpc-apple-macos/lib/libretrocrt-carbon.a" ]; then
echo "Creating dummy libretrocrt-carbon.a for $arch..."
"$PREFIX/bin/powerpc-apple-macos-ar" cqs "$PREFIX/powerpc-apple-macos/lib/libretrocrt-carbon.a"
if [ $BUILD_PPC != false ]; then
if [ ! -e "$PREFIX/powerpc-apple-macos/lib/libretrocrt-carbon.a" ]; then
echo "Creating dummy libretrocrt-carbon.a for $arch..."
"$PREFIX/bin/powerpc-apple-macos-ar" cqs "$PREFIX/powerpc-apple-macos/lib/libretrocrt-carbon.a"
fi
fi
# the real libretrocrt.a is built and installed by
# `cmake --build build-target --target install` later