Bug 643167 - js/src configure should build js-config with MAKE, not GMAKE (based on patch by Kyle Huey); r=ted
authorEd Morley <bmo@edmorley.co.uk>
Thu, 08 Dec 2011 20:02:26 +0000
changeset 83950 758a0ae33484d5c8c9086055524c15eece0440c8
parent 83949 19d325115037d6d012e2fdb3281f09a1dca305ad
child 83951 fe8612e51e8a54c0fa996950383c7920989afe58
push idunknown
push userunknown
push dateunknown
reviewersted
bugs643167, 605133
milestone11.0a1
Bug 643167 - js/src configure should build js-config with MAKE, not GMAKE (based on patch by Kyle Huey); r=ted * Switches js-config generation to use $MAKE rather than $GMAKE, since using make.exe on pymake builds causes issues: "config/autoconf.mk:354: *** Windows-style srcdir being used with GNU make" * Ensures $MAKE is defined for configure when using client.mk * For standalone js builds client.mk won't be used, so sets $MAKE manually if it isn't already defined, to avoid bug 605133 comment 22.
client.mk
js/src/configure.in
--- a/client.mk
+++ b/client.mk
@@ -289,16 +289,20 @@ CONFIG_STATUS_DEPS := \
 	$(TOPSRCDIR)/.mozconfig.mk \
 	$(wildcard $(TOPSRCDIR)/nsprpub/configure) \
 	$(wildcard $(TOPSRCDIR)/config/milestone.txt) \
 	$(wildcard $(TOPSRCDIR)/js/src/config/milestone.txt) \
 	$(wildcard $(TOPSRCDIR)/browser/config/version.txt) \
 	$(wildcard $(addsuffix confvars.sh,$(wildcard $(TOPSRCDIR)/*/))) \
 	$(NULL)
 
+CONFIGURE_ENV_ARGS += \
+  MAKE="$(MAKE)" \
+  $(NULL)
+
 # configure uses the program name to determine @srcdir@. Calling it without
 #   $(TOPSRCDIR) will set @srcdir@ to "."; otherwise, it is set to the full
 #   path of $(TOPSRCDIR).
 ifeq ($(TOPSRCDIR),$(OBJDIR))
   CONFIGURE = ./configure
 else
   CONFIGURE = $(TOPSRCDIR)/configure
 endif
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1235,16 +1235,21 @@ mingw*)
     MOZ_PATH_PROGS(GMAKE, $GMAKE $NOT_PYMAKE gmake make, :)
     ;;
 esac
 if test "$GMAKE" = ":"; then
    AC_MSG_ERROR([GNU make not found])
 fi
 AC_SUBST(GMAKE)
 
+# MAKE will be set by client.mk, but still need this for standalone js builds
+if test -z "$MAKE"; then
+  MAKE=$GMAKE
+fi
+
 if test "$COMPILE_ENVIRONMENT"; then
 
 AC_PATH_XTRA
 
 XCFLAGS="$X_CFLAGS"
 
 fi # COMPILE_ENVIRONMENT
 
@@ -5383,18 +5388,18 @@ if cmp -s config/autoconf.mk config/auto
   echo "config/autoconf.mk is unchanged"
   mv -f config/autoconf.mk.orig config/autoconf.mk 2> /dev/null
 else
   rm -f config/autoconf.mk.orig 2> /dev/null
 fi
 
 # Produce the js-config script at configure time; see the comments for
 # 'js-config' in Makefile.in.
-AC_MSG_RESULT(invoking make to create js-config script)
-$GMAKE js-config
+AC_MSG_RESULT(invoking $MAKE to create js-config script)
+$MAKE js-config
 
 # Build jsctypes if it's enabled.
 if test "$JS_HAS_CTYPES" -a -z "$MOZ_NATIVE_FFI"; then
   # Run the libffi 'configure' script.
   ac_configure_args="--disable-shared --enable-static --disable-raw-api"
   if test "$MOZ_DEBUG"; then
     ac_configure_args="$ac_configure_args --enable-debug"
   fi