Commit f1246644 authored by Stephen Martinis's avatar Stephen Martinis Committed by Commit Bot

Remove GYP_DEFINES reference

This was deleted source side in https://crrev.com/c/1308912 with
seemingly no ill effects.

Bug: chromium:718157
Change-Id: Ic2516b391b76a8fb72df97f6f090af3c24f35766
Reviewed-on: https://chromium-review.googlesource.com/c/1371035Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58141}
parent 5c8560a7
...@@ -36,19 +36,6 @@ def WriteFile(filename, content): ...@@ -36,19 +36,6 @@ def WriteFile(filename, content):
f.write('\n') f.write('\n')
def GetArch():
gyp_host_arch = re.search(
'host_arch=(\S*)', os.environ.get('GYP_DEFINES', ''))
if gyp_host_arch:
arch = gyp_host_arch.group(1)
# This matches detect_host_arch.py.
if arch == 'x86_64':
return 'x64'
return arch
return DetectHostArch()
def FetchAndExtract(arch): def FetchAndExtract(arch):
archdir = os.path.join(BINUTILS_DIR, 'Linux_' + arch) archdir = os.path.join(BINUTILS_DIR, 'Linux_' + arch)
tarball = os.path.join(archdir, BINUTILS_FILE) tarball = os.path.join(archdir, BINUTILS_FILE)
...@@ -99,7 +86,7 @@ def main(args): ...@@ -99,7 +86,7 @@ def main(args):
if not sys.platform.startswith('linux'): if not sys.platform.startswith('linux'):
return 0 return 0
arch = GetArch() arch = DetectHostArch()
if arch == 'x64': if arch == 'x64':
return FetchAndExtract(arch) return FetchAndExtract(arch)
if arch == 'ia32': if arch == 'ia32':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment