mirror of
https://github.com/autc04/Retro68.git
synced 2024-05-28 18:41:41 +00:00
build-toolchain: don't create empty libretrocrt.a, override cmake's compiler test instead
This commit is contained in:
parent
413bb90073
commit
e92b60224d
|
@ -520,31 +520,6 @@ if [ $BUILD_PPC != false ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# if [ $BUILD_PPC != false ]; then
|
|
||||||
# echo "Copying PowerPC import libraries..."
|
|
||||||
# cp $SRC/ImportLibraries/*.a toolchain/powerpc-apple-macos/lib/
|
|
||||||
#fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# If this is the first build,
|
|
||||||
# create an empty libretrocrt.a for each platform so that cmake's compiler
|
|
||||||
# test doesn't fail
|
|
||||||
for arch in $ARCHS; do
|
|
||||||
if [ ! -e "$PREFIX/${arch}-apple-macos/lib/libretrocrt.a" ]; then
|
|
||||||
echo "Creating dummy libretrocrt.a for $arch..."
|
|
||||||
"$PREFIX/bin/${arch}-apple-macos-ar" cqs "$PREFIX/${arch}-apple-macos/lib/libretrocrt.a"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
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
|
|
||||||
|
|
||||||
##################### Setup Interfaces & Libraries
|
##################### Setup Interfaces & Libraries
|
||||||
|
|
||||||
|
@ -558,6 +533,7 @@ if [ $BUILD_68K != false ]; then
|
||||||
|
|
||||||
cmake ${SRC} -DCMAKE_TOOLCHAIN_FILE=../build-host/cmake/intree.toolchain.cmake \
|
cmake ${SRC} -DCMAKE_TOOLCHAIN_FILE=../build-host/cmake/intree.toolchain.cmake \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
|
||||||
"-DINTERFACE_O=${INTERFACE_O}" \
|
"-DINTERFACE_O=${INTERFACE_O}" \
|
||||||
${CMAKE_GENERATOR}
|
${CMAKE_GENERATOR}
|
||||||
cd ..
|
cd ..
|
||||||
|
@ -572,6 +548,7 @@ if [ $BUILD_PPC != false ]; then
|
||||||
cd build-target-ppc
|
cd build-target-ppc
|
||||||
cmake ${SRC} -DCMAKE_TOOLCHAIN_FILE=../build-host/cmake/intreeppc.toolchain.cmake \
|
cmake ${SRC} -DCMAKE_TOOLCHAIN_FILE=../build-host/cmake/intreeppc.toolchain.cmake \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
|
||||||
${CMAKE_GENERATOR}
|
${CMAKE_GENERATOR}
|
||||||
cd ..
|
cd ..
|
||||||
cmake --build build-target-ppc --target install
|
cmake --build build-target-ppc --target install
|
||||||
|
@ -584,6 +561,7 @@ if [ $BUILD_CARBON != false ]; then
|
||||||
cd build-target-carbon
|
cd build-target-carbon
|
||||||
cmake ${SRC} -DCMAKE_TOOLCHAIN_FILE=../build-host/cmake/intreecarbon.toolchain.cmake \
|
cmake ${SRC} -DCMAKE_TOOLCHAIN_FILE=../build-host/cmake/intreecarbon.toolchain.cmake \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
|
||||||
${CMAKE_GENERATOR}
|
${CMAKE_GENERATOR}
|
||||||
cd ..
|
cd ..
|
||||||
cmake --build build-target-carbon --target install
|
cmake --build build-target-carbon --target install
|
||||||
|
|
Loading…
Reference in New Issue
Block a user