Merge branch 'main' into feat/cmake-win-pass

conda-forge · Oct 25, 2024 · e487a5f · e487a5f
2 parents f4d9def + 74e2cff
commit e487a5f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
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