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

Bug 777379 - Ensure that default is always the default target. r=ted

parent 014e0b48

build/pymake/pymake/data.py

+4 −0
Original line number Diff line number Diff line
@@ -1542,6 +1542,10 @@ class Makefile(object): 
        if len(np.rules):

            self.context = process.getcontext(1)



	flavor, source, value = self.variables.get('.DEFAULT_GOAL')

        if value is not None:

            self.defaulttarget = value.resolvestr(self, self.variables, ['.DEFAULT_GOAL']).strip()



        self.error = False



    def include(self, path, required=True, weak=False, loc=None):

build/pymake/tests/default-goal.mk

0 → 100644
+7 −0
Original line number Diff line number Diff line 
not-default:

	@echo TEST-FAIL



default:

	@echo TEST-PASS



.DEFAULT_GOAL := default

config/rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -1753,6 +1753,7 @@ libs export:: 
default all::

	if test -d $(DIST)/bin ; then touch $(DIST)/bin/.purgecaches ; fi



.DEFAULT_GOAL := default



#############################################################################

# Derived targets and dependencies

js/src/config/rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -1753,6 +1753,7 @@ libs export:: 
default all::

	if test -d $(DIST)/bin ; then touch $(DIST)/bin/.purgecaches ; fi



.DEFAULT_GOAL := default



#############################################################################

# Derived targets and dependencies