Bug 919735: For VS2013, put the 32-bit PGO files first on the PATH. r=ted

build/pgo/profileserver.py

@@ -17,6 +17,7 @@ import shutil
 import tempfile
 from datetime import datetime
 from mozbuild.base import MozbuildObject
+from buildconfig import substs
 
 PORT = 8888
 
@@ -54,6 +55,14 @@ if __name__ == '__main__':
     env = os.environ.copy()
     env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
     env["XPCOM_DEBUG_BREAK"] = "warn"
+
+    # For VC12, make sure we can find the right bitness of pgort120.dll
+    if "VS120COMNTOOLS" in env and not substs["HAVE_64BIT_OS"]:
+      vc12dir = os.path.abspath(os.path.join(env["VS120COMNTOOLS"],
+                                             "../../VC/bin"))
+      if os.path.exists(vc12dir):
+        env["PATH"] = vc12dir + ";" + env["PATH"]
+
     jarlog = os.getenv("JARLOG_FILE")
     if jarlog:
       env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)

toolkit/mozapps/installer/packager.py

@@ -137,6 +137,15 @@ def precompile_cache(formatter, source_path, gre_path, app_path):
     fd, cache = mkstemp('.zip')
     os.close(fd)
     os.remove(cache)
+
+    # For VC12, make sure we can find the right bitness of pgort120.dll
+    env = os.environ.copy()
+    if 'VS120COMNTOOLS' in env and not buildconfig.substs['HAVE_64BIT_OS']:
+      vc12dir = os.path.abspath(os.path.join(env['VS120COMNTOOLS'],
+                                             '../../VC/bin'))
+      if os.path.exists(vc12dir):
+        env['PATH'] = vc12dir + ';' + env['PATH']
+
     try:
         if launcher.launch(['xpcshell', '-g', gre_path, '-a', app_path,
                             '-f', os.path.join(os.path.dirname(__file__),
@@ -144,7 +153,8 @@ def precompile_cache(formatter, source_path, gre_path, app_path):
                             '-e', 'precompile_startupcache("resource://%s/");'
                                   % resource],
                            extra_linker_path=gre_path,
-                           extra_env={'MOZ_STARTUP_CACHE': cache}):
+                           extra_env={'MOZ_STARTUP_CACHE': cache,
+                                      'PATH': env['PATH']}):
             errors.fatal('Error while running startup cache precompilation')
             return
         from mozpack.mozjar import JarReader