Merge branch 'dev'

herumi · Sep 2, 2024 · 4be6f0b · 4be6f0b
2 parents 7ee34b6 + 4a455b1
commit 4be6f0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Makefile.onelib b/Makefile.onelib
@@ -40,8 +40,9 @@ BINT_OBJ=$(MCL_DIR)/$(OBJ_DIR)/bint$(BIT).o
 
 ifeq ($(CPU),x86-64)
   _ARCH=amd64
-  MSM=msm_avx
-  MCL_MSM?=1
+  ifeq ($(UNAME_S),Darwin)
+    MCL_MSM?=1
+  endif
 endif
 ifeq ($(CPU),aarch64)
   _ARCH=arm64
@@ -73,6 +74,9 @@ MIN_CFLAGS+=-DMCL_USE_LLVM=1
 OBJS+=$(BASE_OBJ)
 endif
 ifeq ($(MCL_MSM),1)
+  ifeq ($(CPU),x86-64)
+    MSM=msm_avx
+  endif
   MIN_CFLAGS+=-DMCL_MSM=1
   MSM_OBJ=$(MCL_DIR)/$(OBJ_DIR)/$(MSM).o
   OBJS+=$(MSM_OBJ)

diff --git a/mcl b/mcl