From 6fe1e35fabc4bf37899105bbcf7cecf46e48aaa9 Mon Sep 17 00:00:00 2001 From: David Major Date: Mon, 3 Jun 2019 20:30:31 +0000 Subject: [PATCH] Bug 1553864 - Clean up some VS2015 PGO build config code r=nalexander This code was already dead during the VS2017 era (since that compiler changed to the `Hostx64\x86` path scheme), let alone clang-cl. Differential Revision: https://phabricator.services.mozilla.com/D33513 --HG-- extra : moz-landing-system : lando --- build/pgo/profileserver.py | 12 ------------ toolkit/mozapps/installer/packager.py | 11 ----------- 2 files changed, 23 deletions(-) diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py index aacec93a8be3..d8801b86b44f 100755 --- a/build/pgo/profileserver.py +++ b/build/pgo/profileserver.py @@ -8,7 +8,6 @@ import json import os import sys -from buildconfig import substs from mozbuild.base import MozbuildObject from mozfile import TemporaryDirectory from mozhttpd import MozHttpd @@ -92,17 +91,6 @@ if __name__ == '__main__': # Ensure different pids write to different files env["LLVM_PROFILE_FILE"] = "default_%p_random_%m.profraw" - # For VC12+, make sure we can find the right bitness of pgort1x0.dll - if not substs.get('HAVE_64BIT_BUILD'): - for e in ('VS140COMNTOOLS', 'VS120COMNTOOLS'): - if e not in env: - continue - - vcdir = os.path.abspath(os.path.join(env[e], '../../VC/bin')) - if os.path.exists(vcdir): - env['PATH'] = '%s;%s' % (vcdir, env['PATH']) - break - # Write to an output file if we're running in automation process_args = {} if 'UPLOAD_PATH' in env: diff --git a/toolkit/mozapps/installer/packager.py b/toolkit/mozapps/installer/packager.py index 6e3b3a7ba878..90c643fd881c 100644 --- a/toolkit/mozapps/installer/packager.py +++ b/toolkit/mozapps/installer/packager.py @@ -82,17 +82,6 @@ class ToolLauncher(object): for e in extra_env: env[e] = extra_env[e] - # For VC12+, make sure we can find the right bitness of pgort1x0.dll - if not buildconfig.substs.get('HAVE_64BIT_BUILD'): - for e in ('VS140COMNTOOLS', 'VS120COMNTOOLS'): - if e not in env: - continue - - vcdir = os.path.abspath(os.path.join(env[e], '../../VC/bin')) - if os.path.exists(vcdir): - env['PATH'] = '%s;%s' % (vcdir, env['PATH']) - break - # Work around a bug in Python 2.7.2 and lower where unicode types in # environment variables aren't handled by subprocess. for k, v in env.items():