Bug 1100925 - Changed old-configure.in to detect mingw32-make as a priority. r?gps draft
authorNathan Hakkakzadeh <nhakkakzadeh@mozilla.com>
Thu, 23 Jun 2016 13:58:14 -0700
changeset 387435 d899af450469c870b8b98a3529bd0a8ce1932ad4
parent 387434 a847bffa63924fed2d66a7bc717301c3e23a7e4a
child 387436 5c05652a02e396877fc24613a0a98469dcb92bcb
push id22949
push userbmo:nhakkakzadeh@mozilla.com
push dateWed, 13 Jul 2016 22:42:05 +0000
reviewersgps
bugs1100925
milestone50.0a1
Bug 1100925 - Changed old-configure.in to detect mingw32-make as a priority. r?gps This is what we want on msys2 installations, since it is compliant and installable with the package manager. MozReview-Commit-ID: ARMcpJmbk2 *** Bug 1100925 - Have JS subconfigure recognize mingw32-make as a valid GMAKE. r?gps MozReview-Commit-ID: Gg8FcgW7BHM
js/src/old-configure.in
old-configure.in
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -432,17 +432,17 @@ fi # COMPILE_ENVIRONMENT
 if test -n "$MAKE"; then
   if test `echo $MAKE | grep -c make.py` != 1; then
      NOT_PYMAKE=$MAKE
   fi
 fi
 
 case "$host_os" in
 mingw*)
-    MOZ_PATH_PROGS(GMAKE, $GMAKE $NOT_PYMAKE make gmake, :)
+    MOZ_PATH_PROGS(GMAKE, $GMAKE mingw32-make $NOT_PYMAKE make gmake, :)
     ;;
 *)
     MOZ_PATH_PROGS(GMAKE, $GMAKE $NOT_PYMAKE gmake make, :)
     ;;
 esac
 if test "$GMAKE" = ":"; then
    AC_MSG_ERROR([GNU make not found])
 fi
--- a/old-configure.in
+++ b/old-configure.in
@@ -631,17 +631,17 @@ fi # COMPILE_ENVIRONMENT
 if test -n "$MAKE"; then
   if test `echo $MAKE | grep -c make.py` != 1; then
      NOT_PYMAKE=$MAKE
   fi
 fi
 
 case "$host_os" in
 mingw*)
-    MOZ_PATH_PROGS(GMAKE, $GMAKE $NOT_PYMAKE make gmake, :)
+    MOZ_PATH_PROGS(GMAKE, $GMAKE mingw32-make $NOT_PYMAKE make gmake, :)
     ;;
 *)
     MOZ_PATH_PROGS(GMAKE, $GMAKE $NOT_PYMAKE gmake make, :)
     ;;
 esac
 if test "$GMAKE" = ":"; then
    AC_MSG_ERROR([GNU make not found])
 fi