src/trusted/service_runtime/build.scons - Issue 9824001: Change built_elsewhere flag to work with pexe mode

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/trusted/service_runtime/build.scons

Issue 9824001: Change built_elsewhere flag to work with pexe mode (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client

Patch Set: comments Created 8 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:

Index: src/trusted/service_runtime/build.scons

diff --git a/src/trusted/service_runtime/build.scons b/src/trusted/service_runtime/build.scons

index 5866d6a9a69a0b376d6c868ff0b7598972d2c017..c59eba3c30828d780ca0259fb70f5e26f49a2bec 100644

--- a/src/trusted/service_runtime/build.scons

+++ b/src/trusted/service_runtime/build.scons

@@ -354,7 +354,8 @@ if ((not env.Bit('coverage_enabled') or not env.Bit('windows')) and

env.EnsureRequiredBuildWarnings()

# Bootstrap loader used on Linux.

-if env.Bit('linux') and not env.CrossToolsBuild():

+if (env.Bit('linux') and not env.CrossToolsBuild() and

+ not env.Bit('built_elsewhere')):

bootstrap_env = env.Clone()

bootstrap_env.Replace(CLANG_OPTS='')

bootstrap_env.FilterOut(CCFLAGS=['-fstack-protector', '-fPIC', '-fPIE',

« no previous file with comments | « site_scons/site_tools/naclsdk.py ('k') | no next file » | no next file with comments »