diff --git a/build-compiler-rt.sh b/build-compiler-rt.sh
index e3636f9..04627e8 100755
--- a/build-compiler-rt.sh
+++ b/build-compiler-rt.sh
@@ -68,7 +68,6 @@ fi
 
 if command -v ninja >/dev/null; then
     CMAKE_GENERATOR="Ninja"
-    BUILDCMD=ninja
 else
     : ${CORES:=$(nproc 2>/dev/null)}
     : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
@@ -79,7 +78,6 @@ else
         CMAKE_GENERATOR="MSYS Makefiles"
         ;;
     esac
-    BUILDCMD=make
 fi
 
 cd llvm-project/compiler-rt
@@ -123,8 +121,8 @@ for arch in $ARCHS; do
         -DCMAKE_C_FLAGS_INIT="$CFGUARD_CFLAGS" \
         -DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \
         $SRC_DIR
-    $BUILDCMD ${CORES:+-j${CORES}}
-    $BUILDCMD install
+    cmake --build . ${CORES:+-j${CORES}}
+    cmake --install .
     mkdir -p "$PREFIX/$arch-w64-mingw32/bin"
     if [ -n "$SANITIZERS" ]; then
         mv "$CLANG_RESOURCE_DIR/lib/windows/"*.dll "$PREFIX/$arch-w64-mingw32/bin"
diff --git a/build-libcxx.sh b/build-libcxx.sh
index 67a1336..04ff326 100755
--- a/build-libcxx.sh
+++ b/build-libcxx.sh
@@ -62,7 +62,6 @@ cd runtimes
 
 if command -v ninja >/dev/null; then
     CMAKE_GENERATOR="Ninja"
-    BUILDCMD=ninja
 else
     : ${CORES:=$(nproc 2>/dev/null)}
     : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
@@ -73,7 +72,6 @@ else
         CMAKE_GENERATOR="MSYS Makefiles"
         ;;
     esac
-    BUILDCMD=make
 fi
 
 for arch in $ARCHS; do
@@ -114,7 +112,7 @@ for arch in $ARCHS; do
         -DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \
         ..
 
-    $BUILDCMD ${CORES:+-j${CORES}}
-    $BUILDCMD install
+    cmake --build . ${CORES:+-j${CORES}}
+    cmake --install .
     cd ..
 done
diff --git a/build-lldb-mi.sh b/build-lldb-mi.sh
index 165c659..66d1ecd 100755
--- a/build-lldb-mi.sh
+++ b/build-lldb-mi.sh
@@ -53,7 +53,6 @@ fi
 
 if command -v ninja >/dev/null; then
     CMAKE_GENERATOR="Ninja"
-    BUILDCMD=ninja
 else
     : ${CORES:=$(nproc 2>/dev/null)}
     : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
@@ -64,7 +63,6 @@ else
         CMAKE_GENERATOR="MSYS Makefiles"
         ;;
     esac
-    BUILDCMD=make
 fi
 
 export LLVM_DIR="$PREFIX"
@@ -147,4 +145,5 @@ cmake \
     $CMAKEFLAGS \
     ..
 
-$BUILDCMD ${CORES:+-j${CORES}} install/strip
+cmake --build . ${CORES:+-j${CORES}}
+cmake --install . --strip
diff --git a/build-llvm.sh b/build-llvm.sh
index c7b809c..d97c10f 100755
--- a/build-llvm.sh
+++ b/build-llvm.sh
@@ -138,7 +138,6 @@ fi
 
 if command -v ninja >/dev/null; then
     CMAKE_GENERATOR="Ninja"
-    BUILDCMD=ninja
 else
     : ${CORES:=$(nproc 2>/dev/null)}
     : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
@@ -149,7 +148,6 @@ else
         CMAKE_GENERATOR="MSYS Makefiles"
         ;;
     esac
-    BUILDCMD=make
 fi
 
 CMAKEFLAGS="$LLVM_CMAKEFLAGS"
@@ -309,6 +307,7 @@ cmake \
     $CMAKEFLAGS \
     ..
 
-$BUILDCMD ${CORES:+-j${CORES}} install/strip
+cmake --build . ${CORES:+-j${CORES}}
+cmake --install . --strip
 
 cp ../LICENSE.TXT $PREFIX
diff --git a/build-openmp.sh b/build-openmp.sh
index de57c88..2473f2b 100755
--- a/build-openmp.sh
+++ b/build-openmp.sh
@@ -52,7 +52,6 @@ cd llvm-project/openmp
 
 if command -v ninja >/dev/null; then
     CMAKE_GENERATOR="Ninja"
-    BUILDCMD=ninja
 else
     : ${CORES:=$(nproc 2>/dev/null)}
     : ${CORES:=$(sysctl -n hw.ncpu 2>/dev/null)}
@@ -63,7 +62,6 @@ else
         CMAKE_GENERATOR="MSYS Makefiles"
         ;;
     esac
-    BUILDCMD=make
 fi
 
 for arch in $ARCHS; do
@@ -95,8 +93,8 @@ for arch in $ARCHS; do
         -DCMAKE_CXX_FLAGS_INIT="$CFGUARD_CFLAGS" \
         $CMAKEFLAGS \
         ..
-    $BUILDCMD ${CORES:+-j${CORES}}
-    $BUILDCMD install
+    cmake --build . ${CORES:+-j${CORES}}
+    cmake --install .
     rm -f $PREFIX/$arch-w64-mingw32/bin/*iomp5md*
     rm -f $PREFIX/$arch-w64-mingw32/lib/*iomp5md*
     cd ..