Skip to content

Commit

Permalink
Bug 1415971 - Remove MOZ_PREFLIGHT_ALL and MOZ_POSTFLIGHT_ALL; r=nale…
Browse files Browse the repository at this point in the history
…xander

After removing sccache.mk, there are no more references to these
variables. Let's nuke them.

MozReview-Commit-ID: LH1oHm59SnU

--HG--
extra : rebase_source : 5138ddd703350caa5f54fe8941a2e0dcb9dc2c17
  • Loading branch information
indygreg committed Nov 9, 2017
1 parent 67d153a commit c7987e6
Showing 1 changed file with 0 additions and 26 deletions.
26 changes: 0 additions & 26 deletions client.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
# Options:
# MOZ_OBJDIR - Destination object directory
# MOZ_MAKE_FLAGS - Flags to pass to $(MAKE)
# MOZ_PREFLIGHT_ALL - Makefiles to run before building.
# MOZ_POSTFLIGHT_ALL - Makefiles to run after building.
#
#######################################################################
# Defines
Expand Down Expand Up @@ -153,17 +151,6 @@ endif
# helper target for mobile
build_and_deploy: build package install

#####################################################
# Preflight, before building any project

ifdef MOZ_PREFLIGHT_ALL
build preflight_all::
set -e; \
for mkfile in $(MOZ_PREFLIGHT_ALL); do \
$(MAKE) -f $(TOPSRCDIR)/$$mkfile preflight_all TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \
done
endif

# In automation, manage an sccache daemon. The starting of the server
# needs to be in a make file so sccache inherits the jobserver.
ifdef MOZBUILD_MANAGE_SCCACHE_DAEMON
Expand Down Expand Up @@ -292,9 +279,6 @@ build:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
$(OBJDIR_TARGETS):: $(OBJDIR)/Makefile $(OBJDIR)/config.status
+$(MOZ_MAKE) $@

####################################
# Postflight, after building all projects

ifdef MOZ_AUTOMATION
build::
$(MAKE) -f $(TOPSRCDIR)/client.mk automation/build
Expand All @@ -306,14 +290,6 @@ build::
-$(MOZBUILD_MANAGE_SCCACHE_DAEMON) --stop-server
endif

ifdef MOZ_POSTFLIGHT_ALL
build postflight_all::
set -e; \
for mkfile in $(MOZ_POSTFLIGHT_ALL); do \
$(MAKE) -f $(TOPSRCDIR)/$$mkfile postflight_all TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \
done
endif

echo-variable-%:
@echo $($*)

Expand All @@ -325,6 +301,4 @@ echo-variable-%:
.PHONY: \
build \
configure \
preflight_all \
postflight_all \
$(OBJDIR_TARGETS)

0 comments on commit c7987e6

Please sign in to comment.