Fix msys path and cmake

xmos · Nov 7, 2023 · 34c6b22 · 34c6b22
1 parent 0c7e370
commit 34c6b22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -198,7 +198,8 @@ jobs:
         with:
           msystem: mingw64
           update: true
-          install: mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang mingw-w64-x86_64-llvm mingw-w64-x86_64-lld
+          release: false
+          install: mingw-w64-x86_64-clang mingw-w64-x86_64-llvm mingw-w64-x86_64-lld
       - name: Build setup
         shell: cmd
         run: |

diff --git a/python/xmos_ai_tools/xinterpreters/CMakeLists.txt b/python/xmos_ai_tools/xinterpreters/CMakeLists.txt
@@ -9,7 +9,7 @@ set(CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOS
 #**********************
 # Build flags
 #**********************
-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
   set(BUILD_FLAGS "/O2")
 else()
   set(BUILD_FLAGS