pnacl/driver/driver_tools.py - Issue 12459004: Adjust pnacl-translate sbtc flag override mechanism to append.

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 12459004: Adjust pnacl-translate sbtc flag override mechanism to append. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: do cpu check Created 7 years, 9 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 a05813597f3be114af5cc5b0f34f6464b03a70d1..8a1b16b11c485ee37bc4d04cec65727641863dcf 100755

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

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

@@ -1074,7 +1074,11 @@ def ArchMerge(filename, must_match):

def CheckTranslatorPrerequisites():

""" Assert that the scons artifacts for running the sandboxed translator

exist: sel_universal, and sel_ldr. """

- for var in ['SEL_UNIVERSAL', 'SEL_LDR', 'BOOTSTRAP_LDR']:

+ reqs = ['SEL_UNIVERSAL', 'SEL_LDR']

+ # Linux also requires the nacl bootstrap helper.

+ if GetBuildOS() == 'linux':

+ reqs.append('BOOTSTRAP_LDR')

+ for var in reqs:

needed_file = env.getone(var)

if not pathtools.exists(needed_file):

Log.Fatal('Could not find %s [%s]', var, needed_file)

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