Bug 1100925 - Changed old-configure.in to detect mingw32-make as a priority. r=gps
authorNathan Hakkakzadeh <nhakkakzadeh@mozilla.com>
Thu, 23 Jun 2016 13:58:14 -0700
changeset 330162 fcfae9412c0dfd74fc85a665deff86a8cb61e238
parent 330161 b2d61577bd01dd43f63cc18f161e1db2f68b6a34
child 330163 dafdf2ce12471d187e7171c0ca80ece1626cd593
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
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