From e92d15e459c709d45b8903e290d42ce53a2c404a Mon Sep 17 00:00:00 2001 From: tellowkrinkle Date: Sat, 17 Jul 2021 17:39:29 -0500 Subject: [PATCH] CI: Fix avx2-pch build Was broken when `ADDITIONAL_CMAKE_ARGS` got quoted --- .github/workflows/scripts/linux/generate-cmake.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/scripts/linux/generate-cmake.sh b/.github/workflows/scripts/linux/generate-cmake.sh index 3cf8118267..ad9aa0cdef 100755 --- a/.github/workflows/scripts/linux/generate-cmake.sh +++ b/.github/workflows/scripts/linux/generate-cmake.sh @@ -11,8 +11,7 @@ else fi if [ "${PLATFORM}" = x86 ]; then - ADDITIONAL_CMAKE_ARGS="$ADDITIONAL_CMAKE_ARGS" - TOOLCHAIN="cmake/linux-compiler-i386-multilib.cmake" + ADDITIONAL_CMAKE_ARGS="$ADDITIONAL_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake" fi echo "Additional CMake Args - ${ADDITIONAL_CMAKE_ARGS}" @@ -27,7 +26,7 @@ cmake \ -DCMAKE_INSTALL_DOCDIR="/tmp/PCSX2" \ -DOpenGL_GL_PREFERENCE="LEGACY" \ -DOPENGL_opengl_LIBRARY="" \ --DXDG_STD=TRUE "${ADDITIONAL_CMAKE_ARGS}" \ --DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN" \ +-DXDG_STD=TRUE \ +$ADDITIONAL_CMAKE_ARGS \ -GNinja \ -B build