Bug 753132: Update mozconfig for doing 32-bit builds on 64-bit machines. r=ted
authorChris AtLee <catlee@mozilla.com>
Mon, 14 May 2012 12:04:37 -0400
changeset 94002 a0cca6997af4cc4ce62dafe1260b7dae5231e891
parent 94001 10eafc58701edf95c481b555534add4e4545c8cb
child 94003 61e99099ba4e3bb42bbe100ad9a451b4515f8806
push id9409
push usercatlee@mozilla.com
push dateTue, 15 May 2012 15:05:12 +0000
treeherdermozilla-inbound@32913047a915 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs753132
milestone15.0a1
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
Bug 753132: Update mozconfig for doing 32-bit builds on 64-bit machines. r=ted
Makefile.in
build/win32/mozconfig.vs2010-win64
--- a/Makefile.in
+++ b/Makefile.in
@@ -172,17 +172,17 @@ SYM_STORE_SOURCE_DIRS := $(topsrcdir)
 
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 ifdef MOZ_SYMBOLS_EXTRA_BUILDID
 EXTRA_BUILDID := -$(MOZ_SYMBOLS_EXTRA_BUILDID)
 endif
 
 SYMBOL_INDEX_NAME = \
-  $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)$(EXTRA_BUILDID)-symbols.txt
+  $(MOZ_APP_NAME)-$(MOZ_APP_VERSION)-$(OS_TARGET)-$(BUILDID)-$(CPU_ARCH)$(EXTRA_BUILDID)-symbols.txt
 
 buildsymbols:
 ifdef MOZ_CRASHREPORTER
 ifdef USE_ELF_HACK
     ifeq (mobile,$(MOZ_BUILD_APP))
 		$(MAKE) -C mobile/xul/installer elfhack
     else
 		$(MAKE) -C $(MOZ_BUILD_APP)/installer elfhack
--- a/build/win32/mozconfig.vs2010-win64
+++ b/build/win32/mozconfig.vs2010-win64
@@ -1,12 +1,13 @@
 export INCLUDE=/c/tools/msvs10/vc/include:/c/tools/msvs10/vc/atlmfc/include:/c/tools/sdks/v7.0/include:/c/tools/sdks/v7.0/include/atl:/c/tools/sdks/dx10/include
 export LIBPATH=/c/tools/msvs10/vc/lib:/c/tools/msvs10/vc/atlmfc/lib
 export LIB=/c/tools/msvs10/vc/lib:/c/tools/msvs10/vc/atlmfc/lib:/c/tools/sdks/v7.0/lib:/c/tools/sdks/dx10/lib
-export PATH="/c/tools/msvs10/Common7/IDE:/c/tools/msvs10/VC/BIN:/c/tools/msvs10/Common7/Tools:/c/tools/msvs10/VC/VCPackages:${PATH}"
 export WIN32_REDIST_DIR=/c/tools/msvs10/VC/redist/x86/Microsoft.VC100.CRT
-
+export MOZ_TOOLS=C:/mozilla-build/moztools
+export PATH="/c/tools/msvs10/Common7/IDE:/c/tools/msvs10/VC/BIN:/c/tools/msvs10/Common7/Tools:/c/tools/msvs10/VC/VCPackages:/c/mozilla-build/moztools:/c/Tools/sdks/v7.0/bin:${PATH}"
 
 mk_add_options "export LIB=$LIB"
 mk_add_options "export LIBPATH=$LIBPATH"
 mk_add_options "export PATH=$PATH"
 mk_add_options "export INCLUDE=$INCLUDE"
 mk_add_options "export WIN32_REDIST_DIR=$WIN32_REDIST_DIR"
+mk_add_options "export MOZ_TOOLS=$MOZ_TOOLS"