Skip to content

Commit 641815a

Browse files
committed
Do not install LLVM before building
1 parent 375fed5 commit 641815a

2 files changed

Lines changed: 1 addition & 9 deletions

File tree

‎.ci/common/build.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ 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-
LLVM_PATH=`dirname $(which llvm-tblgen)`
17-
echo "LLVM bin: $LLVM_PATH"
1816
export QEMU_LD_PREFIX="$BUILD_SYSROOT_PATH"
1917
echo "QEMU prefix: $QEMU_LD_PREFIX"
20-
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"
18+
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"
2119
else
2220
cmake -B "$BUILD_DIR" -DCMAKE_BUILD_TYPE=Release -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=OFF || exit 3
2321
fi

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,6 @@ jobs:
4242
sed -i -e '/^$/d' .github/config.env
4343
cat .github/config.env >> "${GITHUB_ENV}"
4444
shell: bash
45-
## Install LLVM (for host build tools)
46-
- if: "!contains(matrix.arch, 'amd64')"
47-
name: Setup LLVM
48-
uses: ZhongRuoyu/setup-llvm@v0
49-
with:
50-
llvm-version: 19
5145
## Install dependencies
5246
- if: contains(matrix.arch, 'amd64')
5347
name: Install dependencies

0 commit comments

Comments
 (0)