fix: allow building natives without mingw

RelativityMC · Oct 8, 2024 · e77ca4f · e77ca4f
1 parent 8a0c5c8
commit e77ca4f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,8 +27,8 @@ jobs:
       with:
         version: "18.1.8"
 
-    - name: Install MinGW and other required dependencies
-      run: sudo apt install mingw-w64 libtinfo5 crossbuild-essential-arm64
+    - name: Install required dependencies
+      run: sudo apt install libtinfo5
 
     - uses: actions/cache@v4
       with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,8 +31,8 @@ jobs:
       with:
         version: "18.1.8"
 
-    - name: Install MinGW and other required dependencies
-      run: sudo apt install mingw-w64 libtinfo5 crossbuild-essential-arm64
+    - name: Install required dependencies
+      run: sudo apt install libtinfo5
 
     - uses: actions/cache@v4
       with:

diff --git a/c2me-opts-natives-math/src/c/CMakeLists.txt b/c2me-opts-natives-math/src/c/CMakeLists.txt
@@ -8,6 +8,9 @@ set(CMAKE_C_STANDARD 11)
 
 SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g")
 
+set(CMAKE_C_STANDARD_LIBRARIES "")
+set(CMAKE_CXX_STANDARD_LIBRARIES "")
+
 add_library(c2me-opts-natives-math SHARED
         exports.c
         system_isa_x86_64.c
@@ -24,4 +27,5 @@ execute_process(COMMAND llvm-config --prefix OUTPUT_VARIABLE LLVM_PREFIX OUTPUT_
 
 target_include_directories(c2me-opts-natives-math PRIVATE includes/)
 target_compile_options(c2me-opts-natives-math PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wall -Wextra -Wpedantic -ffreestanding -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-compilation-dir=. -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-prefix-map=${LLVM_PREFIX}=.../llvm-prefix -fno-math-errno -mprefer-vector-width=512 -ffp-contract=off -Rpass-analysis=loop-vectorize -mno-stack-arg-probe -fsave-optimization-record "SHELL:-mllvm -extra-vectorizer-passes" "SHELL:-mllvm -slp-vectorize-hor-store" "SHELL:-mllvm -slp-min-tree-size=1" "SHELL:-mllvm -slp-min-reg-size=64" "SHELL:-mllvm -slp-threshold=-1" "SHELL:-mllvm -enable-epilogue-vectorization">)
-target_link_options(c2me-opts-natives-math PRIVATE -nostdlib -fuse-ld=lld -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-compilation-dir=. -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-prefix-map=${LLVM_PREFIX}=.../llvm-prefix)
+target_link_options(c2me-opts-natives-math PRIVATE -v -nostdlib -fuse-ld=lld -ffile-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-compilation-dir=. -fdebug-prefix-map=${CMAKE_SOURCE_DIR}=. -fdebug-prefix-map=${LLVM_PREFIX}=.../llvm-prefix)
+