src/native_client/site_scons/site_init.py - Issue 6719038: Revert r4644, "Updated NaCl's build system to use SCons 2.0.1."

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: src/native_client/site_scons/site_init.py

Issue 6719038: Revert r4644, "Updated NaCl's build system to use SCons 2.0.1." (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: Created 9 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: src/native_client/site_scons/site_init.py

diff --git a/src/native_client/site_scons/site_init.py b/src/native_client/site_scons/site_init.py

index cdadfbcfd21fc2abcaf649bfe754f7069b5afd24..5539541910bb16911138d33df6cd9781e9e60146 100755

--- a/src/native_client/site_scons/site_init.py

+++ b/src/native_client/site_scons/site_init.py

@@ -118,7 +118,7 @@ def BuildEnvironmentSConscripts(env):

# Also, if we are passed a SConscript that

# is not under $MAIN_DIR, we should fail loudly, because it is unclear how

# this will correspond to things under $OBJ_ROOT.

- ec.SConscript(c_script, variant_dir='$OBJ_ROOT/' + c_dir,

+ ec.SConscript(c_script, build_dir='$OBJ_ROOT/' + c_dir,

exports={'env': ec}, duplicate=0)

else:

raise SCons.Error.UserError(

« no previous file with comments | « src/native_client/scons.bat ('k') | src/native_client/site_scons/site_tools/component_builders.py » ('j') | no next file with comments »