Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Bug 1416052 - Remove comment filtering; r=nalexander
Browse files Browse the repository at this point in the history
The auto-generated make file that we include (and the `mach environment`
output that we included before that) should not contain comment lines.
I think it is safe to remove the code that filters them out.

It is possible a multi-line value in mozconfigs could contain lines
looking like comments and this may cause problems. I'm inclined to
believe that this scenario doesn't exist. If someone complains and
we need to bring back support, we could certainly do that.

MozReview-Commit-ID: 8kKw91HH4ms
  • Loading branch information
indygreg committed Nov 10, 2017
1 parent 293b921 commit 7793fdf
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions client.mk
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ include $(OBJDIR)/.mozconfig-client-mk
# to then replace newlines with normal spaces. This allows to get a list
# of mozconfig output lines.
MOZCONFIG_OUT_LINES := $(subst $(CR), ,$(subst $(NULL) $(NULL),||,$(MOZCONFIG_CONTENT)))
# Filter-out comments from those lines.
START_COMMENT = \#
MOZCONFIG_OUT_FILTERED := $(filter-out $(START_COMMENT)%,$(MOZCONFIG_OUT_LINES))

ifdef AUTOCLOBBER
export AUTOCLOBBER=1
Expand Down Expand Up @@ -118,9 +115,9 @@ include $(OBJDIR)/.mozconfig.mk

# Print out any options loaded from mozconfig.
all build clean distclean export libs install realclean::
ifneq (,$(strip $(MOZCONFIG_OUT_FILTERED)))
ifneq (,$(strip $(MOZCONFIG_OUT_LINES)))
$(info Adding client.mk options from $(FOUND_MOZCONFIG):)
$(foreach line,$(MOZCONFIG_OUT_FILTERED),$(info $(NULL) $(NULL) $(NULL) $(NULL) $(subst ||, ,$(line))))
$(foreach line,$(MOZCONFIG_OUT_LINES),$(info $(NULL) $(NULL) $(NULL) $(NULL) $(subst ||, ,$(line))))
endif

# helper target for mobile
Expand Down

0 comments on commit 7793fdf

Please sign in to comment.