Merge branch 'dev'

Makefile

@@ -225,6 +225,7 @@ minimized_static_test: $(EXE_DIR)/minimized_static_test.exe
 
 
 clean:
+	make -C $(MCL_DIR) clean
 	$(RM) $(OBJ_DIR)/*.d $(OBJ_DIR)/*.o $(EXE_DIR)/*.exe $(GEN_EXE) $(ASM_SRC) $(ASM_OBJ) $(LLVM_SRC) $(BLS256_LIB) $(BLS256_SLIB) $(BLS384_LIB) $(BLS384_SLIB) $(BLS384_256_LIB) $(BLS384_256_SLIB) $(BLS512_LIB) $(BLS512_SLIB)
 
 ALL_SRC=$(SRC_SRC) $(TEST_SRC) $(SAMPLE_SRC)

Makefile.onelib

@@ -58,9 +58,14 @@ ifeq ($(CPU),systemz)
   _ARCH=s390x
 endif
 
-ifneq ($(TARGET),)
-  MIN_CFLAGS+=-target $(TARGET)
-  ASFLAGS+=-target $(TARGET)
+ifeq ($(UNAME_S),Darwin)
+ifeq ($(CLANG_TARGET),)
+CLANG_TARGET?=$(ARCH)-apple-macos
+endif
+endif
+ifneq ($(CLANG_TARGET),)
+  MIN_CFLAGS+=-target $(CLANG_TARGET)
+  ASFLAGS+=-target $(CLANG_TARGET)
 endif
 OBJS+=$(BINT_OBJ)
 ifeq ($(findstring $(OS),mingw64/cygwin),)
@@ -172,10 +177,10 @@ endif
 # cross compile
 # e.g. make -f Makefile.onelib CXX=clang++ AS=clang++ build_aarch64 LLVM_VER=-12
 build_aarch64:
-	$(MAKE) -f $(THIS_FILE) ARCH=aarch64 TARGET=aarch64
+	$(MAKE) -f $(THIS_FILE) ARCH=aarch64 CLANG_TARGET=aarch64
 #	$(CXX) -target aarch64 test/bls_c384_256_test.cpp -I ./include -I mcl/include bls/lib/linux/arm64/libbls384_256.a
 build_i686:
-	$(MAKE) -f $(THIS_FILE) ARCH=x86 TARGET=i686
+	$(MAKE) -f $(THIS_FILE) ARCH=x86 CLANG_TARGET=i686
 #	g++ -m32 test/bls_c384_256_test.cpp -I ./include -I mcl/include bls/lib/linux/libbls384_256.a
 
 clean: