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 305197 fcfae9412c0dfd74fc85a665deff86a8cb61e238
parent 305196 b2d61577bd01dd43f63cc18f161e1db2f68b6a34
child 305198 dafdf2ce12471d187e7171c0ca80ece1626cd593
push id79518
push usercbook@mozilla.com
push dateSun, 17 Jul 2016 08:09:59 +0000
treeherdermozilla-inbound@711963e8daa3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1100925
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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