build-openmp.sh: Use llvm-ml instead of uasm

build-openmp.sh

@@ -54,31 +54,13 @@ else
     BUILDCMD=make
 fi
 
-if [ ! -x "$(which uasm)" ]; then
-    echo Building the OpenMP runtime requires UASM
-    exit 1
-fi
-UASM=uasm
-case $(uname) in
-MINGW*|MSYS*)
-    # On windows, only building with ninja works; building with msys make
-    # ends up mangling the forward slashes in certain options to UASM.
-    ;;
-*)
-    # UASM for unix doesn't support options with forward slashes, which CMake
-    # produces in some places. And ninja on windows can't execute a
-    # shell script, so this has to be done only on unix.
-    UASM=uasm-wrapper.sh
-    ;;
-esac
-
 for arch in $ARCHS; do
     CMAKEFLAGS=""
     case $arch in
     i686)
         ;;
     x86_64)
-        CMAKEFLAGS="$CMAKEFLAGS -DLIBOMP_ASMFLAGS=-win64"
+        CMAKEFLAGS="$CMAKEFLAGS -DLIBOMP_ASMFLAGS=-m64"
         ;;
     *)
         # Not supported
@@ -97,7 +79,7 @@ for arch in $ARCHS; do
         -DCMAKE_C_COMPILER=$arch-w64-mingw32-clang \
         -DCMAKE_CXX_COMPILER=$arch-w64-mingw32-clang++ \
         -DCMAKE_RC_COMPILER=$arch-w64-mingw32-windres \
-        -DCMAKE_ASM_MASM_COMPILER=$UASM \
+        -DCMAKE_ASM_MASM_COMPILER=llvm-ml \
         -DCMAKE_CROSSCOMPILING=TRUE \
         -DCMAKE_SYSTEM_NAME=Windows \
         -DCMAKE_AR="$PREFIX/bin/llvm-ar" \