Update build_osx.sh for x86_64 and arm64 architectures

Author: jaebeom-kim

util/build_osx.sh

@@ -39,7 +39,11 @@ mkdir -p "$BUILD/build_libomp/openmp-${OMPVERSION}.src/build-amd64" && cd "$BUIL
 cmake \
     -DLIBOMP_ENABLE_SHARED=OFF \
     -DLIBOMP_INSTALL_ALIASES=OFF \
-    -DLIBOMP_ARCH=x86_64 -DCMAKE_CXX_FLAGS="-arch x86_64" \
+    -DLIBOMP_ARCH=x86_64 \
+    -DCMAKE_OSX_ARCHITECTURES=x86_64 \
+    -DCMAKE_C_FLAGS="-arch x86_64" \
+    -DCMAKE_CXX_FLAGS="-arch x86_64" \
+    -DLIBOMP_ASMFLAGS="-arch x86_64" \
     ..
 make -j${CPUS}
 export LIBOMP_AMD64="$BUILD/build_libomp/openmp-${OMPVERSION}.src/build-amd64/runtime/src"
@@ -48,7 +52,8 @@ mkdir -p "$BUILD/build_avx2" && cd "$BUILD/build_avx2"
 cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DHAVE_TESTS=0 -DHAVE_MPI=0 -DHAVE_AVX2=1 \
-    -DCMAKE_C_FLAGS="-arch x86_64h" -DCMAKE_CXX_FLAGS="-arch x86_64h" \
+    -DCMAKE_OSX_ARCHITECTURES=x86_64 \
+    -DCMAKE_C_FLAGS="-arch x86_64" -DCMAKE_CXX_FLAGS="-arch x86_64" -DCMAKE_ASM_FLAGS="-arch arm64" \
     -DBUILD_SHARED_LIBS=OFF -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
     -DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I${LIBOMP_AMD64}" -DOpenMP_C_LIB_NAMES=omp -DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I${LIBOMP_AMD64}" -DOpenMP_CXX_LIB_NAMES=omp -DOpenMP_omp_LIBRARY=${LIBOMP_AMD64}/libomp.a \
     -DRust_CARGO_TARGET=x86_64-apple-darwin \
@@ -74,7 +79,10 @@ mkdir -p "$BUILD/build_libomp/openmp-${OMPVERSION}.src/build-arm64" && cd "$BUIL
 cmake \
     -DLIBOMP_ENABLE_SHARED=OFF \
     -DLIBOMP_INSTALL_ALIASES=OFF \
-    -DLIBOMP_ARCH=aarch64 -DCMAKE_CXX_FLAGS="-arch arm64" \
+    -DLIBOMP_ARCH=aarch64 \
+    -DCMAKE_OSX_ARCHITECTURES=arm64 \
+    -DCMAKE_C_FLAGS="-arch arm64" \
+    -DCMAKE_CXX_FLAGS="-arch arm64" \
     -DLIBOMP_ASMFLAGS="-arch arm64" \
     ..
 make -j${CPUS}
@@ -84,7 +92,8 @@ mkdir -p "$BUILD/build_arm64" && cd "$BUILD/build_arm64"
 cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DHAVE_TESTS=0 -DHAVE_MPI=0 -DHAVE_ARM8=1 \
-    -DCMAKE_C_FLAGS="-arch arm64" -DCMAKE_CXX_FLAGS="-arch arm64" \
+    -DCMAKE_OSX_ARCHITECTURES=arm64 \
+    -DCMAKE_C_FLAGS="-arch arm64" -DCMAKE_CXX_FLAGS="-arch arm64" -DCMAKE_ASM_FLAGS="-arch arm64" \
     -DBUILD_SHARED_LIBS=OFF -DCMAKE_FIND_LIBRARY_SUFFIXES=".a" \
     -DOpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I${LIBOMP_AARCH64}" -DOpenMP_C_LIB_NAMES=omp -DOpenMP_CXX_FLAGS="-Xpreprocessor -fopenmp -I${LIBOMP_AARCH64}" -DOpenMP_CXX_LIB_NAMES=omp -DOpenMP_omp_LIBRARY=${LIBOMP_AARCH64}/libomp.a \
     -DRust_CARGO_TARGET=aarch64-apple-darwin \