pnacl/driver/driver_tools.py - Issue 580983002: Remove i686-hosted Linux build and start switching to new directory layout

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pnacl/driver/driver_tools.py

Issue 580983002: Remove i686-hosted Linux build and start switching to new directory layout (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: review 2, put back test and build.sh patch from PS5 Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: pnacl/driver/driver_tools.py

diff --git a/pnacl/driver/driver_tools.py b/pnacl/driver/driver_tools.py

index a41e14ab8a5f5e36b9e81341b0313b1a5be908b0..f836483a5f3754dfeea7003fd2efbc8181e1945b 100755

--- a/pnacl/driver/driver_tools.py

+++ b/pnacl/driver/driver_tools.py

@@ -230,11 +230,10 @@ def FindBaseHost(tool):

return prefix

base_pnacl = FindBasePNaCl()

- base_host = pathtools.join(base_pnacl, 'host_' + env.getone('HOST_ARCH'))

- if not pathtools.exists(pathtools.join(base_host, 'bin',

+ if not pathtools.exists(pathtools.join(base_pnacl, 'bin',

tool + env.getone('EXEC_EXT'))):

Log.Fatal('Could not find PNaCl host directory for ' + tool)

- return base_host

+ return base_pnacl

def ReadConfig():

# Mock out ReadConfig if running unittests. Settings are applied directly

« no previous file with comments | « pnacl/build.sh ('k') | pnacl/driver/pnacl-llc.py » ('j') | no next file with comments »