Skip to content

Commit f604825

Browse files
committed
Use native LLVM build tools
1 parent 741de4f commit f604825

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

‎.ci/common/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ mkdir -p "$BUILD_DIR"
1313
if [[ "$PLATFORM" == "win64" ]] || [[ "$PLATFORM" == "win32" ]]; then
1414
cmake -B "$BUILD_DIR" -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=OFF || exit 3
1515
elif [[ "$PLATFORM" == "linux_aarch64" ]]; then
16-
cmake -B "$BUILD_DIR" -DCMAKE_BUILD_TYPE=Release -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=OFF -DCMAKE_PREFIX_PATH="$QT_ROOT_DIR" -DCMAKE_TOOLCHAIN_FILE="$BUILD_TOOLCHAIN_CONFIG" -DCMAKE_FIND_ROOT_PATH="$QT_ROOT_DIR" -DQT_HOST_PATH="$QT_HOST_PATH" -DQT_HOST_CMAKE_DIR="$QT_HOST_PATH/lib/cmake"
16+
cmake -B "$BUILD_DIR" -DCMAKE_BUILD_TYPE=Release -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=OFF -DCMAKE_PREFIX_PATH="$QT_ROOT_DIR" -DCMAKE_TOOLCHAIN_FILE="$BUILD_TOOLCHAIN_CONFIG" -DCMAKE_FIND_ROOT_PATH="$QT_ROOT_DIR" -DQT_HOST_PATH="$QT_HOST_PATH" -DQT_HOST_CMAKE_DIR="$QT_HOST_PATH/lib/cmake" -DLLVM_NATIVE_TOOL_DIR="$LLVM_PATH/bin"
1717
else
1818
cmake -B "$BUILD_DIR" -DCMAKE_BUILD_TYPE=Release -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=OFF || exit 3
1919
fi

‎.github/workflows/linux-build.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,14 @@ jobs:
103103
with:
104104
path: ./qt-cross/
105105
key: qt-cross-${{ runner.os }}-${{ matrix.qt-version }}-${{ matrix.qt-target }}-${{ matrix.qt-modules }}-${{ matrix.arch }}
106+
## Install LLVM (for host build tools)
107+
- if: "!contains(matrix.arch, 'amd64')"
108+
name: Install LLVM
109+
uses: KyleMayes/install-llvm-action@v2
110+
with:
111+
version: "19.1.0"
112+
env: false
113+
directory: ${{ runner.temp }}/llvm # get this from $LLVM_PATH
106114
## Build
107115
- name: Build AppImage
108116
run: .ci/build_appimage.sh ${{ matrix.arch }}

0 commit comments

Comments
 (0)