author | Kyle Huey <khuey@kylehuey.com> |
Sat, 21 Aug 2010 09:24:34 -0400 | |
changeset 51162 | 2cfcf5515e1b38d6cbaa0e6f901bbd9dabe18cdf |
parent 51161 | 5c5c3bf8dfeb14ee91516997172dfe0f8e10af21 |
child 51163 | 9f78a5f80a44a7441ca3afbf986260373dccf102 |
push id | 15229 |
push user | khuey@kylehuey.com |
push date | Sat, 21 Aug 2010 13:25:39 +0000 |
treeherder | mozilla-central@2cfcf5515e1b [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
bugs | 578563 |
milestone | 2.0b5pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/client.mk +++ b/client.mk @@ -137,39 +137,35 @@ MOZCONFIG_MODULES := build/unix/uniq.pl run_for_side_effects := \ $(shell $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) $(TOPSRCDIR)/.mozconfig.mk > $(TOPSRCDIR)/.mozconfig.out) include $(TOPSRCDIR)/.mozconfig.mk +ifndef MOZ_OBJDIR + MOZ_OBJDIR = obj-$(CONFIG_GUESS) +endif + ifdef MOZ_BUILD_PROJECTS -ifndef MOZ_OBJDIR - $(error When MOZ_BUILD_PROJECTS is set, you must set MOZ_OBJDIR) -endif ifdef MOZ_CURRENT_PROJECT OBJDIR = $(MOZ_OBJDIR)/$(MOZ_CURRENT_PROJECT) MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR) BUILD_PROJECT_ARG = MOZ_BUILD_APP=$(MOZ_CURRENT_PROJECT) else OBJDIR = $(error Cannot find the OBJDIR when MOZ_CURRENT_PROJECT is not set.) MOZ_MAKE = $(error Cannot build in the OBJDIR when MOZ_CURRENT_PROJECT is not set.) endif else # MOZ_BUILD_PROJECTS -ifdef MOZ_OBJDIR - OBJDIR = $(MOZ_OBJDIR) - MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR) -else - OBJDIR := $(TOPSRCDIR) - MOZ_MAKE := $(MAKE) $(MOZ_MAKE_FLAGS) -endif +OBJDIR = $(MOZ_OBJDIR) +MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR) endif # MOZ_BUILD_PROJECTS # 'configure' scripts generated by autoconf. CONFIGURES := $(TOPSRCDIR)/configure CONFIGURES += $(TOPSRCDIR)/js/src/configure #######################################################################