Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(926)

Unified Diff: tests/sysbasic/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
« no previous file with comments | « tests/file/nacl.scons ('k') | tools/tests/nacl.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/sysbasic/nacl.scons
===================================================================
--- tests/sysbasic/nacl.scons (revision 2045)
+++ tests/sysbasic/nacl.scons (working copy)
@@ -29,10 +29,14 @@
Import('env')
+# 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('sysbasic.nexe',
- 'sysbasic.c',
- EXTRA_LIBS=['pthread', 'nosys'])
+env.ComponentProgram('sysbasic.nexe', 'sysbasic.c', EXTRA_LIBS=extra_libs)
node = env.CommandSelLdrTestNacl(
'sysbasic_test.out',
« no previous file with comments | « tests/file/nacl.scons ('k') | tools/tests/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698