Merge pull request #894 from bitraid/fix-build

Fix msys2 ucrt debug build
FarGroup · Dec 27, 2024 · e652072 · e652072
2 parents 6e5828a + 0c3a1c1
commit e652072
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -195,6 +195,7 @@ jobs:
         run: |
           echo "DEBUG=1" >> "$GITHUB_ENV"
           echo "USE_LLD=1" >> "$GITHUB_ENV"
+          test "${{ matrix.sys }}" = "ucrt64" -o "${{ matrix.sys }}" = "clang64" && echo "USER_LIBS=-lucrtbased" >> "$GITHUB_ENV" || true
           pacboy --noconfirm -S --needed lld:p
 
       - name: Build Far
@@ -273,11 +274,7 @@ jobs:
         run: |
           echo "DEBUG=1" >> "$GITHUB_ENV"
           echo "USE_LLD=1" >> "$GITHUB_ENV"
-
-      - name: Set more environment for debug build
-        if: matrix.c_lib == 'ucrt' && matrix.build_type == 'Debug'
-        run: |
-          echo "USER_LIBS=-lucrtbased" >> "$GITHUB_ENV"
+          test "${{ matrix.c_lib }}" = "ucrt" && echo "USER_LIBS=-lucrtbased" >> "$GITHUB_ENV" || true
 
       - name: Build far
         working-directory: far