diff --git a/build-mingw-w64.sh b/build-mingw-w64.sh
index 2fad646..8be416b 100755
--- a/build-mingw-w64.sh
+++ b/build-mingw-w64.sh
@@ -99,6 +99,14 @@ if [ -n "$HOST" ]; then
     CONFIGFLAGS="$CONFIGFLAGS --host=$HOST"
     CROSS_NAME=$HOST-
     EXEEXT=.exe
+else
+    case $(uname) in
+    MINGW*)
+        EXEEXT=.exe
+        ;;
+    *)
+        ;;
+    esac
 fi
 if [ -n "$SKIP_INCLUDE_TRIPLET_PREFIX" ]; then
     CONFIGFLAGS="$CONFIGFLAGS --with-widl-includedir=$PREFIX/include"
diff --git a/strip-llvm.sh b/strip-llvm.sh
index 3427b01..33b2cc1 100755
--- a/strip-llvm.sh
+++ b/strip-llvm.sh
@@ -9,6 +9,14 @@ fi
 PREFIX="$1"
 cd "$PREFIX"
 
+case $(uname) in
+MINGW*)
+    EXEEXT=.exe
+    ;;
+*)
+    ;;
+esac
+
 cd bin
 for i in bugpoint c-index-test clang-* diagtool dsymutil git-clang-format hmaptool ld64.lld llc lli llvm-* obj2yaml opt sancov sanstats scan-build scan-view verify-uselistorder wasm-ld yaml2obj libclang.dll LTO.dll *.bat; do
     basename=$i