Fixed Msys workflow (3)

tamatebako · Mar 8, 2024 · 111c28e · 111c28e
1 parent cad1eef
commit 111c28e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/windows-msys.yml b/.github/workflows/windows-msys.yml
@@ -114,14 +114,17 @@ jobs:
         with:
           submodules: true
 
+      - name: Get number of CPU cores
+        run:  echo "CORES=$(nproc --all)" >> $GITHUB_ENV
+
       - name: Configure
         run: |
-          cmake -B build -DWITH_TESTS=${{ matrix.setup.tests }} -DUSE_JEMALLOC=OFF -DPREFER_SYSTEM_GTEST=ON -DNIXPKGS_DWARFS_VERSION_OVERRIDE=tebako \
+          cmake -B build -DWITH_TESTS=${{ matrix.setup.tests }} -DUSE_JEMALLOC=OFF -DNIXPKGS_DWARFS_VERSION_OVERRIDE=tebako \
                 -DFOLLY_NO_EXCEPTION_TRACER=ON -DTEBAKO_BUILD_SCOPE=${{ matrix.setup.scope }} -DCMAKE_INSTALL_PREFIX=install -GNinja .
 
       - name: Build
         run: |
-          cmake --build build --parallel 8
+          cmake --build build --parallel $CORES
 
 #      - name: Test
 #        if: ${{ matrix.setup.tests == 'ON' }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -211,6 +211,10 @@ if ("${OSTYPE_TXT}" MATCHES "msys")
   add_dependencies(_LIBARCHIVE ${LIBUTFCPP_PRJ})
   add_link_options(-mconsole)
   add_compile_options(-mconsole)
+
+  # This is because of some new features of glog 0.7.0
+  add_definitions(-DGLOG_USE_GLOG_EXPORT)
+
   set(PATCH_FOLLY ON)
   set(PATCH_FBTHRIFT ON)
 endif()

diff --git a/include/dwarfs_tool_main.h b/include/dwarfs_tool_main.h
@@ -23,7 +23,7 @@
 
 #include "dwarfs/types.h"
 
-#ifdef _WIN32
+#ifdef _MSC_VER
 #define SYS_MAIN wmain
 #else
 #define SYS_MAIN main