site_scons/site_tools/naclsdk.py - Issue 8776023: Switch the nop pnacl x86-64 IRT shim to the real one generated from IDL.

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: site_scons/site_tools/naclsdk.py

Issue 8776023: Switch the nop pnacl x86-64 IRT shim to the real one generated from IDL. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: disable pnacl_example_browser for x86-64 until shim updated Created 9 years 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: site_scons/site_tools/naclsdk.py

diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py

index 258b7114fd15c5d2dc57920549ec7de99d5de384..d0ffd186c54f97b5940f60028a25b86576e42f4c 100755

--- a/site_scons/site_tools/naclsdk.py

+++ b/site_scons/site_tools/naclsdk.py

@@ -359,6 +359,12 @@ def PNaClGetNNaClEnv(env):

native_env = env.Clone()

native_env.ClearBits('bitcode')

native_env = native_env.Clone(tools = ['naclsdk'])

+ # These are unfortunately clobbered by running Tool.

+ native_env.Replace(EXTRA_CFLAGS=env['EXTRA_CFLAGS'],

+ EXTRA_CXXFLAGS=env['EXTRA_CXXFLAGS'],

+ CCFLAGS=env['CCFLAGS'],

+ CFLAGS=env['CFLAGS'],

+ CXXFLAGS=env['CXXFLAGS'])

return native_env

« no previous file with comments | « pnacl/build.sh ('k') | src/untrusted/pnacl_irt_shim/nacl.scons » ('j') | no next file with comments »