From 1751e189e7c71b801bd7e805cda18a48556b1d4f Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Wed, 2 Apr 2025 23:45:18 +0200 Subject: remove xcode 12.1 workaround (#339) * remove xcode 12.1 workaround * bump min macos version to 14.0 --- scripts/bundle.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/bundle.lua b/scripts/bundle.lua index 1a81c9b7f..3ca9b7ae4 100644 --- a/scripts/bundle.lua +++ b/scripts/bundle.lua @@ -214,8 +214,8 @@ end -------------------------------------------------------------------------------- local function main_mac(signidentity) -- Build and universalify - _build("x86_64", false, "--target_minver=12.5") - _build("arm64", false, "--target_minver=12.5") + _build("x86_64", false, "--target_minver=14.0") + _build("arm64", false, "--target_minver=14.0") os.mkdir("build/macosx/universal/release/") local ret = _exec( -- cgit v1.2.3 From 351a7befa926741f30d96a9540c7314592c1f0a8 Mon Sep 17 00:00:00 2001 From: Zousar Shaker Date: Fri, 4 Apr 2025 02:20:11 -0600 Subject: Zs/mac restore minver 12.5 (#344) * Restore Mac minver to 12.5 --- scripts/bundle.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/bundle.lua b/scripts/bundle.lua index 3ca9b7ae4..1a81c9b7f 100644 --- a/scripts/bundle.lua +++ b/scripts/bundle.lua @@ -214,8 +214,8 @@ end -------------------------------------------------------------------------------- local function main_mac(signidentity) -- Build and universalify - _build("x86_64", false, "--target_minver=14.0") - _build("arm64", false, "--target_minver=14.0") + _build("x86_64", false, "--target_minver=12.5") + _build("arm64", false, "--target_minver=12.5") os.mkdir("build/macosx/universal/release/") local ret = _exec( -- cgit v1.2.3 From 2f6103bb2b519ecd87575c604d1124c2473def67 Mon Sep 17 00:00:00 2001 From: Liam Mitchell Date: Fri, 13 Jun 2025 00:37:20 +0000 Subject: Update to recent UE toolchain, and link statically against toolchain libc++ and libc++abi --- scripts/ue_build_linux/clang | 2 +- scripts/ue_build_linux/clang++ | 2 +- scripts/ue_build_linux/get_ue_toolchain.sh | 12 +----------- scripts/ue_build_linux/ue_build.sh | 2 +- 4 files changed, 4 insertions(+), 14 deletions(-) (limited to 'scripts') diff --git a/scripts/ue_build_linux/clang b/scripts/ue_build_linux/clang index f3af44c9c..9666ba4ba 100755 --- a/scripts/ue_build_linux/clang +++ b/scripts/ue_build_linux/clang @@ -1,2 +1,2 @@ #!/bin/sh -exec $UE_TOOLCHAIN_DIR/bin/clang --sysroot=$UE_TOOLCHAIN_DIR $CFLAGS $* +exec $UE_TOOLCHAIN_DIR/bin/clang --sysroot=$UE_TOOLCHAIN_DIR $CFLAGS "$@" diff --git a/scripts/ue_build_linux/clang++ b/scripts/ue_build_linux/clang++ index d2ebda549..be106ae87 100755 --- a/scripts/ue_build_linux/clang++ +++ b/scripts/ue_build_linux/clang++ @@ -1,2 +1,2 @@ #!/bin/sh -exec $UE_TOOLCHAIN_DIR/bin/clang++ --sysroot=$UE_TOOLCHAIN_DIR -stdlib=libc++ $CXXFLAGS $* +exec $UE_TOOLCHAIN_DIR/bin/clang++ --sysroot=$UE_TOOLCHAIN_DIR -stdlib=libc++ $CXXFLAGS "$@" diff --git a/scripts/ue_build_linux/get_ue_toolchain.sh b/scripts/ue_build_linux/get_ue_toolchain.sh index f4a1b58d4..dab87cf88 100755 --- a/scripts/ue_build_linux/get_ue_toolchain.sh +++ b/scripts/ue_build_linux/get_ue_toolchain.sh @@ -24,8 +24,7 @@ cd $1 mkdir -p tmp cd tmp -#CLANG_VERSION=v21_clang-15.0.1-centos7 -CLANG_VERSION=v22_clang-16.0.6-centos7 +CLANG_VERSION=v25_clang-18.1.0-rockylinux8 TOOLCHAIN_PLATFORM=x86_64-unknown-linux-gnu echo "Fetching UE toolchain $CLANG_VERSION..." @@ -38,13 +37,4 @@ mv $CLANG_VERSION/$TOOLCHAIN_PLATFORM/* .. cd .. rm -rf tmp -rm -rf usr/lib -mkdir -p usr/lib -mv usr/lib64/*.o usr/lib - -echo "Fetching UE headers and libc++ from $ZEN_ROOT/thirdparty/ue-libcxx..." -cp -r $ZEN_ROOT/thirdparty/ue-libcxx/include/* ./include -mkdir -p ./lib64 -cp -r $ZEN_ROOT/thirdparty/ue-libcxx/lib64/* ./lib64 - echo "Done" diff --git a/scripts/ue_build_linux/ue_build.sh b/scripts/ue_build_linux/ue_build.sh index e9c3b2cf6..4613dd5ec 100755 --- a/scripts/ue_build_linux/ue_build.sh +++ b/scripts/ue_build_linux/ue_build.sh @@ -24,4 +24,4 @@ export LD="clang++" export PATH="$(realpath $(dirname ${BASH_SOURCE[0]})):$PATH" shift -exec $* +exec "$@" -- cgit v1.2.3