tests/file/nacl.scons - Issue 1593024: We should not include -lnosys on ARM: it comes automatically and will spoil...

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: tests/file/nacl.scons

Issue 1593024: We should not include -lnosys on ARM: it comes automatically and will spoil... (Closed) Base URL: http://nativeclient.googlecode.com/svn/trunk/src/native_client/

Patch Set: '' Created 10 years, 8 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: tests/file/nacl.scons

===================================================================

--- tests/file/nacl.scons (revision 2045)

+++ tests/file/nacl.scons (working copy)

@@ -31,9 +31,14 @@

Import('env')

-env.ComponentProgram('file.nexe', 'file.cc',

- EXTRA_LIBS=['pthread', 'nosys'])

+# Don't use -lnosys on ARM - it's automagically included and will spoil

+# things if included before -lc

+if env['TARGET_ARCHITECTURE'] == arm:

+ extra_libs = ['pthread']

+else:

+ extra_libs = ['pthread', 'nosys']

+env.ComponentProgram('file.nexe', 'file.c', EXTRA_LIBS=extra_libs)

# TODO: add tests back in

# NOTE: this smoke tests currently fails in "test17"

« no previous file with comments | « no previous file | tests/sysbasic/nacl.scons » ('j') | no next file with comments »