Commit b360aa3c authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 927260 - Invoke the right gmake when building gaia. r=gps

parent 7cdd7d23

b2g/gaia/Makefile.in

+8 −3
Original line number Diff line number Diff line
@@ -9,13 +9,18 @@ DEFINES += \ 
  -DB2G_NAME=L\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \

  -DGAIA_PATH=L\"$(subst /,\\\\,$(GAIA_PATH))\" \

  $(NULL)

GAIA_MAKE=make

else # Non-windows machines use the same wrapper program

CSRCS = run-b2g.c

DEFINES += \

  -DB2G_NAME=\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \

  -DGAIA_PATH=\"$(GAIA_PATH)\" \

  $(NULL)

endif



ifdef .PYMAKE

# For use of GNU make in pymake builds.

GAIA_MAKE=$(GMAKE)

else

GAIA_MAKE=$(MAKE)

endif
@@ -27,6 +32,6 @@ GENERATED_DIRS += $(DIST)/bin/$(GAIA_PATH) 
include $(topsrcdir)/config/rules.mk



libs::

	$(GAIA_MAKE) -j1 -C $(GAIADIR) clean

	$(GAIA_MAKE) -j1 -C $(GAIADIR) profile

	+$(GAIA_MAKE) -j1 -C $(GAIADIR) clean

	+$(GAIA_MAKE) -j1 -C $(GAIADIR) profile

	(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(abspath $(DIST))/bin/$(GAIA_PATH) && tar -xf -)