diff --git a/.github/workflows/linux_build_qt.yml b/.github/workflows/linux_build_qt.yml index 0887b67587..d65d8afc51 100644 --- a/.github/workflows/linux_build_qt.yml +++ b/.github/workflows/linux_build_qt.yml @@ -102,7 +102,10 @@ jobs: env: COMPILER: ${{ inputs.compiler }} ADDITIONAL_CMAKE_ARGS: ${{ inputs.cmakeflags }} - run: .github/workflows/scripts/linux/generate-cmake-qt.sh + CLANG_PATH: /usr/bin/clang-12 + CLANGXX_PATH: /usr/bin/clang++-12 + run: | + DEPS_PREFIX="$HOME/deps" .github/workflows/scripts/linux/generate-cmake-qt.sh - name: Build PCSX2 working-directory: build diff --git a/.github/workflows/scripts/linux/generate-cmake-qt.sh b/.github/workflows/scripts/linux/generate-cmake-qt.sh index 47de04eec0..2329d15b86 100755 --- a/.github/workflows/scripts/linux/generate-cmake-qt.sh +++ b/.github/workflows/scripts/linux/generate-cmake-qt.sh @@ -2,16 +2,28 @@ set -e +if [[ -z "${DEPS_PREFIX}" ]]; then + echo "DEPS_PREFIX is not set." + exit 1 +fi + +echo "Using build dependencies from: ${DEPS_PREFIX}" + if [ "${COMPILER}" = "clang" ]; then + if [[ -z "${CLANG_PATH}" ]] || [[ -z "${CLANGXX_PATH}" ]]; then + echo "CLANG_PATH or CLANGXX_PATH is not set." + exit 1 + fi + echo "Using clang toolchain" - cat > "$HOME/clang-toolchain.cmake" << EOF -set(CMAKE_C_COMPILER /usr/bin/clang-12) -set(CMAKE_CXX_COMPILER /usr/bin/clang++-12) + cat > "clang-toolchain.cmake" << EOF +set(CMAKE_C_COMPILER "${CLANG_PATH}") +set(CMAKE_CXX_COMPILER "${CLANGXX_PATH}") set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld") set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld") set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=lld") EOF - ADDITIONAL_CMAKE_ARGS="$ADDITIONAL_CMAKE_ARGS -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_TOOLCHAIN_FILE=$HOME/clang-toolchain.cmake" + ADDITIONAL_CMAKE_ARGS="$ADDITIONAL_CMAKE_ARGS -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_TOOLCHAIN_FILE=clang-toolchain.cmake" fi echo "Additional CMake Args - ${ADDITIONAL_CMAKE_ARGS}" @@ -31,7 +43,7 @@ cmake \ -DX11_API=ON \ -DWAYLAND_API=ON \ -DENABLE_SETCAP=OFF \ - -DCMAKE_PREFIX_PATH="$HOME/deps" \ + -DCMAKE_PREFIX_PATH="${DEPS_PREFIX}" \ -DUSE_SYSTEM_SDL2=ON \ -DUSE_SYSTEM_ZSTD=OFF \ -DDISABLE_ADVANCE_SIMD=TRUE