Commit 4e2d36e7 authored by dpranke@chromium.org's avatar dpranke@chromium.org

Drop support for buildtools/linux32 in the GN wrapper.

Since we no longer have a 32-bit Linux GN binary, we shouldn't
try to point to one in the gn.py wrapper; this was hiding a
bug on one of the NaCl bots.

R=brettw@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1152163008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295520 0039d316-1c4b-4281-b951-d872f2087c98
parent 67ac65cf
...@@ -708,8 +708,6 @@ def GetBuildtoolsPath(): ...@@ -708,8 +708,6 @@ def GetBuildtoolsPath():
def GetBuildtoolsPlatformBinaryPath(): def GetBuildtoolsPlatformBinaryPath():
"""Returns the full path to the binary directory for the current platform.""" """Returns the full path to the binary directory for the current platform."""
# Mac and Windows just have one directory, Linux has two according to whether
# it's 32 or 64 bits.
buildtools_path = GetBuildtoolsPath() buildtools_path = GetBuildtoolsPath()
if not buildtools_path: if not buildtools_path:
return None return None
...@@ -719,10 +717,7 @@ def GetBuildtoolsPlatformBinaryPath(): ...@@ -719,10 +717,7 @@ def GetBuildtoolsPlatformBinaryPath():
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
subdir = 'mac' subdir = 'mac'
elif sys.platform.startswith('linux'): elif sys.platform.startswith('linux'):
if sys.maxsize > 2**32:
subdir = 'linux64' subdir = 'linux64'
else:
subdir = 'linux32'
else: else:
raise Error('Unknown platform: ' + sys.platform) raise Error('Unknown platform: ' + sys.platform)
return os.path.join(buildtools_path, subdir) return os.path.join(buildtools_path, subdir)
......
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