diff options
| author | Liam Mitchell <[email protected]> | 2025-06-13 00:37:20 +0000 |
|---|---|---|
| committer | Liam Mitchell <[email protected]> | 2025-06-13 00:37:20 +0000 |
| commit | 2f6103bb2b519ecd87575c604d1124c2473def67 (patch) | |
| tree | ac2fdf10c758889ed6df825f0c606a7ec117030d /scripts | |
| parent | 5.6.12 (diff) | |
| download | zen-2f6103bb2b519ecd87575c604d1124c2473def67.tar.xz zen-2f6103bb2b519ecd87575c604d1124c2473def67.zip | |
Update to recent UE toolchain, and link statically against toolchain libc++ and libc++abi
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ue_build_linux/clang | 2 | ||||
| -rwxr-xr-x | scripts/ue_build_linux/clang++ | 2 | ||||
| -rwxr-xr-x | scripts/ue_build_linux/get_ue_toolchain.sh | 12 | ||||
| -rwxr-xr-x | scripts/ue_build_linux/ue_build.sh | 2 |
4 files changed, 4 insertions, 14 deletions
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 "$@" |