Merge pull request #46 from MementoRC/fix/illegal-instruction-linux-64

FIX: linux-64 illegal instruction: MCPU
conda-forge · Oct 25, 2024 · 74e2cff · 74e2cff
2 parents c0bdc3f + 06ab004
commit 74e2cff
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 28 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/recipe/build_scripts/native-cmake-linux-64.sh b/recipe/build_scripts/native-cmake-linux-64.sh
@@ -20,6 +20,7 @@ EXTRA_CMAKE_ARGS+=( \
   "-DZIG_SHARED_LLVM=ON" \
   "-DZIG_USE_LLVM_CONFIG=ON" \
   "-DZIG_TARGET_TRIPLE=${SYSROOT_ARCH}-linux-gnu" \
+  "-DZIG_TARGET_MCPU=baseline" \
 )
 
 # Zig searches for libm.so/libc.so in incorrect paths (libm.so with hard-coded /usr/lib64/libmvec_nonshared.a)

diff --git a/recipe/build_scripts/native-cmake-osx-64.sh b/recipe/build_scripts/native-cmake-osx-64.sh
@@ -21,6 +21,7 @@ EXTRA_CMAKE_ARGS+=( \
   "-DZIG_SHARED_LLVM=ON" \
   "-DZIG_USE_LLVM_CONFIG=ON" \
   "-DZIG_TARGET_TRIPLE=${SYSROOT_ARCH}-macos-none" \
+  "-DZIG_TARGET_MCPU=baseline" \
 )
 
 # When using installed c++ libs, zig needs libzigcpp.a

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -25,7 +25,7 @@ source:
   #   sha256: d45312e61ebcc48032b77bc4cf7fd6915c11fa16e4aad116b66c9468211230ea  # [linux]
 
 build:
-  number: 3
+  number: 4
   skip: true  # [not linux and not osx]
   script_env:
     - BUILD_WITH_CMAKE=1  # [(linux or osx) and x86_64]