diff --git a/mozilla/configure b/mozilla/configure
index bc4d26399c0..9ea6804e2e9 100755
--- a/mozilla/configure
+++ b/mozilla/configure
@@ -2844,7 +2844,7 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4706,7 +4706,7 @@ EOF
         MKSHLIB_FORCE_ALL=
         MKSHLIB_UNFORCE_ALL=
     else
-        CYGWIN_WRAPPER=${srcdir}/build/cygwin-wrapper
+        CYGWIN_WRAPPER="sh ${srcdir}/build/cygwin-wrapper"
         CC=cl
         CXX=cl
         HOST_CC=cl
diff --git a/mozilla/configure.in b/mozilla/configure.in
index 857cd6c2af5..c24a420c6d2 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -902,7 +902,7 @@ case "$target" in
         MKSHLIB_FORCE_ALL=
         MKSHLIB_UNFORCE_ALL=
     else
-        CYGWIN_WRAPPER=${srcdir}/build/cygwin-wrapper
+        CYGWIN_WRAPPER="sh ${srcdir}/build/cygwin-wrapper"
         CC=cl
         CXX=cl
         HOST_CC=cl