Relintai/osxcross
1
0
Fork 0
mirror of https://github.com/Relintai/osxcross.git synced 2025-02-03 22:45:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

build_compiler_rt.sh: Misc fixes. Closes #289.

Browse Source
This commit is contained in:
Thomas Pöchtrager 2021-08-03 12:24:44 +02:00
parent 551d192714
commit 0cc7b8f7dd
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build_compiler_rt.sh
View File

@ -54,7 +54,7 @@ case $CLANG_VERSION in
12.* ) BRANCH=release/12.x; USE_CMAKE=1; ;; 12.* ) BRANCH=release/12.x; USE_CMAKE=1; ;;
13.* ) BRANCH=release/13.x; USE_CMAKE=1; ;; 13.* ) BRANCH=release/13.x; USE_CMAKE=1; ;;
14.* ) BRANCH=main; USE_CMAKE=1; ;; 14.* ) BRANCH=main; USE_CMAKE=1; ;;
* ) echo "Unsupported Clang version, must be >= 3.2 and <= 13.0" 1>&2; exit 1; * ) echo "Unsupported Clang version, must be >= 3.2 and <= 14.0" 1>&2; exit 1;
esac esac
if [ $(osxcross-cmp $CLANG_VERSION ">=" 3.5) -eq 1 ]; then if [ $(osxcross-cmp $CLANG_VERSION ">=" 3.5) -eq 1 ]; then
@ -90,7 +90,6 @@ if [ $f_res -eq 1 ]; then
patch -p1 < $PATCH_DIR/compiler-rt_clock-gettime.patch patch -p1 < $PATCH_DIR/compiler-rt_clock-gettime.patch
fi fi
EXTRA_CMAKE_FLAGS=""
EXTRA_MAKE_FLAGS="" EXTRA_MAKE_FLAGS=""
if [ -n "$OCDEBUG" ]; then if [ -n "$OCDEBUG" ]; then
EXTRA_MAKE_FLAGS+="VERBOSE=1 " EXTRA_MAKE_FLAGS+="VERBOSE=1 "
@ -134,19 +133,18 @@ if [ $f_res -eq 1 ]; then
{ {
local arch=$1 local arch=$1
local build_dir="build" local build_dir="build"
local extra_cmake_flags=""
if [ -n "$arch" ]; then if [ -n "$arch" ]; then
build_dir+="_$arch" build_dir+="_$arch"
EXTRA_CMAKE_FLAGS+="-DDARWIN_osx_ARCHS=$arch " extra_cmake_flags+="-DDARWIN_osx_ARCHS=$arch "
EXTRA_CMAKE_FLAGS+="-DDARWIN_osx_BUILTIN_ARCHS=$arch " extra_cmake_flags+="-DDARWIN_osx_BUILTIN_ARCHS=$arch "
if [[ $arch == arm64* ]]; then if [ $arch == "arm64" ] || [ $arch == "arm64e" ]; then
if [ $(osxcross-cmp $CLANG_VERSION "<" 11) -eq 1 ]; then
# https://github.com/tpoechtrager/osxcross/issues/259 # https://github.com/tpoechtrager/osxcross/issues/259
EXTRA_CMAKE_FLAGS+="-DCOMPILER_RT_BUILD_SANITIZERS=OFF " extra_cmake_flags+="-DCOMPILER_RT_BUILD_SANITIZERS=OFF "
EXTRA_CMAKE_FLAGS+="-DCOMPILER_RT_BUILD_XRAY=OFF " extra_cmake_flags+="-DCOMPILER_RT_BUILD_XRAY=OFF "
fi
fi fi
echo "" echo ""
@ -163,15 +161,15 @@ if [ $f_res -eq 1 ]; then
-DCMAKE_LIPO=$(xcrun -f lipo) \ -DCMAKE_LIPO=$(xcrun -f lipo) \
-DCMAKE_OSX_SYSROOT=$(xcrun --show-sdk-path) \ -DCMAKE_OSX_SYSROOT=$(xcrun --show-sdk-path) \
-DCMAKE_AR=$(xcrun -f ar) \ -DCMAKE_AR=$(xcrun -f ar) \
$EXTRA_CMAKE_FLAGS $extra_cmake_flags
$MAKE -j $JOBS $EXTRA_MAKE_FLAGS $MAKE -j $JOBS $EXTRA_MAKE_FLAGS
popd &>/dev/null popd &>/dev/null
} }
if [ $(osxcross-cmp $SDK_VERSION ">=" 11.0) -eq 1 ]; then if [ $(osxcross-cmp $SDK_VERSION ">=" 11.0) -eq 1 ] &&
if [ $(osxcross-cmp $CLANG_VERSION ">=" 4.0) -eq 1 ]; then [ $(osxcross-cmp $CLANG_VERSION ">=" 4.0) -eq 1 ]; then
# https://github.com/tpoechtrager/osxcross/issues/258 # https://github.com/tpoechtrager/osxcross/issues/258
# https://github.com/tpoechtrager/osxcross/issues/286 # https://github.com/tpoechtrager/osxcross/issues/286
@ -231,7 +229,6 @@ if [ $f_res -eq 1 ]; then
else else
build build
fi fi
fi
### CMAKE END ### ### CMAKE END ###