Permalink
Browse files

Port bug 926900 - Remove msys-make specific mozconfig. rs=build-syste…

…m peer port.
  • Loading branch information...
1 parent af7eadf commit b8a9791dfa7af8152d2fa1fca1bce8689cbc90d8 Mark Banner committed Nov 13, 2013
View
@@ -111,7 +111,7 @@ endef
# before evaluation. $(shell) replacing newlines with spaces, || is always
# followed by a space (since sed doesn't remove newlines), except on the
# last line, so replace both '|| ' and '||'.
-MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/')))
+MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/')))
$(eval $(MOZCONFIG_CONTENT))
# As '||' was used as a newline separator, it means it's not occurring in
@@ -13,12 +13,6 @@ export MOZ_DEBUG_SYMBOLS=1
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-if test -n "${_PYMAKE}"; then
- mk_add_options MOZ_MAKE_FLAGS=-j4
-else
- mk_add_options MOZ_MAKE_FLAGS=-j1
-fi
-
if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
. $topsrcdir/build/win32/mozconfig.vs2010-win64
else
@@ -12,10 +12,6 @@ ac_add_options --enable-calendar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-if test -z "${_PYMAKE}"; then
- mk_add_options MOZ_MAKE_FLAGS=-j1
-fi
-
. $topsrcdir/build/win64/mozconfig.vs2010
# Set up mapi includes (must be done after visual studio setup)
@@ -14,10 +14,6 @@ ac_add_options --enable-calendar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-if test -z "${_PYMAKE}"; then
- mk_add_options MOZ_MAKE_FLAGS=-j1
-fi
-
. $topsrcdir/build/win64/mozconfig.vs2010
# Set up mapi includes (must be done after visual studio setup)
@@ -14,12 +14,6 @@ ac_add_options --enable-calendar
# Needed to enable breakpad in application.ini
export MOZILLA_OFFICIAL=1
-if test -n "${_PYMAKE}"; then
- mk_add_options MOZ_MAKE_FLAGS=-j4
-else
- mk_add_options MOZ_MAKE_FLAGS=-j1
-fi
-
. $topsrcdir/build/win64/mozconfig.vs2010
# Set up mapi includes (must be done after visual studio setup)

0 comments on commit b8a9791

Please sign in to comment.