Continued migrating Windows CI/CD to fully use MSYS2

AdeptLanguage · Jan 6, 2025 · 322d215 · 322d215
1 parent 01f64f8
commit 322d215
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/remoteBuild.yml b/.github/workflows/remoteBuild.yml
@@ -71,7 +71,7 @@ jobs:
         if: ${{ matrix.os == 'windows-latest' }}
         shell: msys2 {0}
         run: |
-          cmake -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_PREFIX_PATH="C:/Windows/System32/ntdll.dll" -DADEPT_LINK_LLVM_STATIC=On -B "${{github.workspace}}/build" -G Ninja
+          cmake -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_STANDARD_LIRBARIES="C:/Windows/System32/ntdll.dll" -DADEPT_LINK_LLVM_STATIC=On -B "${{github.workspace}}/build" -G Ninja
         env:
           LLVM_DIR: ${{github.workspace}}/llvm/llvm/build
           zstd_DIR: C:\msys64\mingw64

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -72,11 +72,19 @@ target_include_directories(adept PRIVATE include ${CURL_INCLUDE_DIR} ${LLVM_INCL
 target_link_directories(adept PRIVATE ${CURL_LIBRARY_DIRS} ${LLVM_LIBRARY_DIRS})
 target_compile_definitions(adept PRIVATE ADEPT_ENABLE_PACKAGE_MANAGER)
 
+if(WIN32)
+    target_link_libraries(adept ntdll)
+endif()
+
 add_library(libadept STATIC)
 target_include_directories(libadept PRIVATE include ${CURL_INCLUDE_DIR} ${LLVM_INCLUDE_DIRS})
 target_link_directories(libadept PRIVATE ${CURL_LIBRARY_DIRS} ${LLVM_LIBRARY_DIRS})
 target_compile_definitions(libadept PRIVATE ADEPT_ENABLE_PACKAGE_MANAGER)
 
+if(WIN32)
+    target_link_libraries(libadept ntdll)
+endif()
+
 message(STATUS "Including debug files")
 list(APPEND core_source_files src/DBG/debug.c)
 add_definitions(-DENABLE_DEBUG_FEATURES)