site_scons/site_tools/naclsdk.py - Issue 583783002: Switch PNaCl lib, include, and translator directories for new 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: site_scons/site_tools/naclsdk.py

Issue 583783002: Switch PNaCl lib, include, and translator directories for new layout (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

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

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

index 1045c22c543fef8ea7f1f1ac0b6a414a4fb5eca4..ce9a2d9025bf4dfd82ff064e56929182dec71286 100755

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

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

@@ -248,8 +248,8 @@ def _SetEnvForPnacl(env, root):

pnacl_translate_flags += ' -sfi-zero-based-sandbox'

env.Replace(# Replace header and lib paths.

- NACL_SDK_INCLUDE=os.path.join(root, 'usr', 'include'),

- NACL_SDK_LIB=os.path.join(root, 'lib'),

+ NACL_SDK_INCLUDE=os.path.join(root, 'le32-nacl', 'include'),

+ NACL_SDK_LIB=os.path.join(root, 'le32-nacl', 'lib'),

# Remove arch-specific flags (if any)

BASE_LINKFLAGS='',

BASE_CFLAGS='',

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