src/native_client/SConstruct - 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/SConstruct

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/SConstruct

diff --git a/src/native_client/SConstruct b/src/native_client/SConstruct

index 895337dbfb452a727e2eb80660a7f987ef295222..9f64b7a605b54c1807ee659dd9290820f5e797ca 100644

--- a/src/native_client/SConstruct

+++ b/src/native_client/SConstruct

@@ -1659,6 +1659,7 @@ base_env.Append(

CFLAGS = ['${EXTRA_CFLAGS}'],

CCFLAGS = ['${EXTRA_CCFLAGS}'],

CXXFLAGS = ['${EXTRA_CXXFLAGS}'],

+ LIBS = ['${EXTRA_LIBS}'],

)

base_env.Append(

@@ -2097,7 +2098,7 @@ nacl_env = pre_base_env.Clone(

'-Wno-long-long',

] +

['${EXTRA_CXXFLAGS}'],

- LIBS = [],

+ LIBS = ['${EXTRA_LIBS}'],

LINKFLAGS = ['${EXTRA_LINKFLAGS}'],

CPPDEFINES = [

# _GNU_SOURCE ensures that strtof() gets declared.

« no previous file with comments | « src/native_client/DEPS ('k') | src/native_client/scons » ('j') | no next file with comments »