зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
Родитель
1fa5a9fd56
Коммит
6fe1e35fab
|
@ -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:
|
||||
|
|
|
@ -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():
|
||||
|
|
Загрузка…
Ссылка в новой задаче