From 8591a03367d2b40e0077b9be6af1472c6903fe02 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Mon, 2 Nov 2026 11:56:54 -0800 Subject: [PATCH] github: Have mingw build build the FEXMingwTests --- .github/workflows/mingw_build.yml | 3 ++- CMakeLists.txt | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/mingw_build.yml b/.github/workflows/mingw_build.yml index df325610a..51c4b1060 100644 --- a/.github/workflows/mingw_build.yml +++ b/.github/workflows/mingw_build.yml @@ -47,7 +47,8 @@ jobs: run: | cmake -S . -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/Data/CMake/toolchain_mingw.cmake \ -DMINGW_TRIPLE=$MINGW_TRIPLE -G Ninja -DENABLE_LTO=False -DENABLE_ASSERTIONS=True -DENABLE_X86_HOST_DEBUG=True -DBUILD_TESTING=False \ - -DCMAKE_INSTALL_PREFIX="$PWD"/build/install + -DCMAKE_INSTALL_PREFIX="$PWD"/build/install \ + -DBUILD_FEX_MINGW_TESTS=True -DLLVM_MINGW="$HOME/llvm-mingw/build/" - name: Build run: cmake --build build diff --git a/CMakeLists.txt b/CMakeLists.txt index 766c6e5b6..c1eea0dbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,8 +60,12 @@ set(X86_64_TOOLCHAIN_FILE if (BUILD_FEX_MINGW_TESTS) set(LLVM_MINGW "" CACHE FILEPATH "Path to llvm_mingw") - set(X86_32_MINGW_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Data/CMake/toolchain_mingw_x86_32.cmake" CACHE FILEPATH "Toolchain file for the (cross-)compiler targeting mingw_i686") - set(X86_64_MINGW_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Data/CMake/toolchain_mingw_x86_64.cmake" CACHE FILEPATH "Toolchain file for the (cross-)compiler targeting mingw_x86_64") + set(X86_32_MINGW_TOOLCHAIN_FILE + "${CMAKE_CURRENT_SOURCE_DIR}/Data/CMake/toolchain_mingw_x86_32.cmake" + CACHE FILEPATH "Toolchain file for the (cross-)compiler targeting mingw_i686") + set(X86_64_MINGW_TOOLCHAIN_FILE + "${CMAKE_CURRENT_SOURCE_DIR}/Data/CMake/toolchain_mingw_x86_64.cmake" + CACHE FILEPATH "Toolchain file for the (cross-)compiler targeting mingw_x86_64") endif() set(X86_DEV_ROOTFS "/" CACHE FILEPATH "Path to the sysroot used for cross-compiling for i686 and x86_64")