Skip to content

Commit

Permalink
Bug 1416052 - Remove mkdir of objdir from client.mk; r=nalexander
Browse files Browse the repository at this point in the history
Now that mach is being used to invoke client.mk, we can perform
objdir directory creation there.

Removing the use of mkdir_deps meant that we could remove some
included make files which AFAICT were only used to provide
$(mkdir_deps).

MozReview-Commit-ID: 4ZRToz8xqZy

--HG--
extra : rebase_source : 8d0d2430b33863e1dec8cee84e72178307d1c6e0
extra : source : d223afd90123eba035714288d5da9394b2dbb8d8
  • Loading branch information
indygreg committed Nov 10, 2017
1 parent 1bddd82 commit 4c71082
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
9 changes: 2 additions & 7 deletions client.mk
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,9 @@ $(error client.mk must be used via `mach`. Try running \
`./mach $(firstword $(MAKECMDGOALS) $(.DEFAULT_GOAL))`)
endif

# Define mkdir
include $(TOPSRCDIR)/config/makefiles/makeutils.mk
include $(TOPSRCDIR)/config/makefiles/autotargets.mk

# For now, only output "export" lines and lines containing UPLOAD_EXTRA_FILES.
MOZCONFIG_MK_LINES := $(filter export||% UPLOAD_EXTRA_FILES% %UPLOAD_EXTRA_FILES%,$(MOZCONFIG_OUT_LINES))
$(OBJDIR)/.mozconfig.mk: $(TOPSRCDIR)/client.mk $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR)) $(OBJDIR)/CLOBBER
$(OBJDIR)/.mozconfig.mk: $(TOPSRCDIR)/client.mk $(FOUND_MOZCONFIG) $(OBJDIR)/CLOBBER
$(if $(MOZCONFIG_MK_LINES),( $(foreach line,$(MOZCONFIG_MK_LINES), echo '$(subst ||, ,$(line))';) )) > $@

# Include that makefile so that it is created. This should not actually change
Expand Down Expand Up @@ -194,7 +190,6 @@ configure-files: $(CONFIGURES)
configure-preqs = \
$(OBJDIR)/CLOBBER \
configure-files \
$(call mkdir_deps,$(OBJDIR)) \
save-mozconfig \
$(OBJDIR)/.mozconfig.json \
$(NULL)
Expand All @@ -206,7 +201,7 @@ CREATE_MOZCONFIG_JSON = $(shell $(TOPSRCDIR)/mach environment --format=json -o $
ifneq (,$(CREATE_MOZCONFIG_JSON))
endif

$(OBJDIR)/.mozconfig.json: $(call mkdir_deps,$(OBJDIR)) ;
$(OBJDIR)/.mozconfig.json: ;

save-mozconfig: $(FOUND_MOZCONFIG)
ifdef FOUND_MOZCONFIG
Expand Down
4 changes: 4 additions & 0 deletions python/mozbuild/mozbuild/controller/building.py
Original file line number Diff line number Diff line change
Expand Up @@ -1278,6 +1278,10 @@ def build(self, what=None, disable_extra_make_dependencies=None, jobs=0,

def configure(self, options=None, buildstatus_messages=False,
line_handler=None):
# Disable indexing in objdir because it is not necessary and can slow
# down builds.
mkdir(self.topobjdir, not_indexed=True)

def on_line(line):
self.log(logging.INFO, 'build_output', {'line': line}, '{line}')

Expand Down

0 comments on commit 4c71082

Please sign in to comment.