Release with clang-cl

netheril96 · Apr 18, 2024 · e1d300b · e1d300b
1 parent cd37adc
commit e1d300b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
@@ -99,7 +99,7 @@ jobs:
           name: securefs-macos-arm64
 
   build-windows:
-    runs-on: windows-latest
+    runs-on: windows-2019
     timeout-minutes: 35
     steps:
       - uses: actions/checkout@v4
@@ -120,7 +120,7 @@ jobs:
           cache-key: windows-latest
           github-binarycache: true
       - name: build-test
-        run: python3 build.py --clang_cl --enable_unit_test --enable_integration_test --vcpkg_root=${{ github.workspace }}/vcpkg --triplet=x64-windows-static-md --build_root=./build --build_type Debug
+        run: python3 build.py --enable_unit_test --enable_integration_test --vcpkg_root=${{ github.workspace }}/vcpkg --triplet=x64-windows-static-md --build_root=./build --build_type Debug
       - name: upload
         uses: actions/upload-artifact@v1
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -116,7 +116,7 @@ jobs:
           name: securefs-macos-arm64-release
 
   build-windows:
-    runs-on: windows-2019
+    runs-on: windows-latest
     timeout-minutes: 35
     steps:
       - uses: actions/checkout@v4
@@ -141,7 +141,7 @@ jobs:
           ref: '${{ steps.get-latest-vcpkg-release.outputs.tag_name }}'
           fetch-depth: 1
       - name: build-test
-        run: python3 build.py --lto --enable_unit_test --enable_integration_test --vcpkg_root=${{ github.workspace }}/vcpkg --triplet=x64-windows-static-md --build_root=./build
+        run: python3 build.py --clang_cl --lto --enable_unit_test --enable_integration_test --vcpkg_root=${{ github.workspace }}/vcpkg --triplet=x64-windows-static-md --build_root=./build
       - name: upload
         uses: actions/upload-artifact@v1
         with:

diff --git a/overlay_triplets/x64-windows-static-md.cmake b/overlay_triplets/x64-windows-static-md.cmake
@@ -1,6 +1,6 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
-set(VCPKG_C_FLAGS_RELEASE "/GL")
-set(VCPKG_CXX_FLAGS_RELEASE "/GL")
+set(VCPKG_C_FLAGS_RELEASE "-flto=thin")
+set(VCPKG_CXX_FLAGS_RELEASE "-flto=thin")
 set(VCPKG_BUILD_TYPE release)