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

Unified Diff: site_scons/site_tools/naclsdk.py

Issue 748283004: Revert SCons portion of r14155 (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Created 6 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: site_scons/site_tools/naclsdk.py
diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py
index b0220b816afa414ae6e93cc8e0e3a54c7ddecbf1..062a0d748e4df7d0369f6950fce4de0c88e65f3b 100755
--- a/site_scons/site_tools/naclsdk.py
+++ b/site_scons/site_tools/naclsdk.py
@@ -101,6 +101,12 @@ def _SetEnvForNativeSdk(env, sdk_path):
cc = 'clang' if env.Bit('nacl_clang') else 'gcc'
cxx = 'clang++' if env.Bit('nacl_clang') else 'g++'
+ # Eventually nacl-clang will default to -no-integrated-as but for now we have
+ # to use the integrated as for compilation because of
+ # https://code.google.com/p/nativeclient/issues/detail?id=3966
+ # However clang's as' support of some of the nacl syntax is incomplete, so for
+ # now use binutils as for our asm files.
+ as_flags = '-no-integrated-as' if env.Bit('nacl_clang') else []
env.Replace(# Replace header and lib paths.
# where to put nacl extra sdk headers
@@ -142,7 +148,7 @@ def _SetEnvForNativeSdk(env, sdk_path):
'-pedantic',
'-D__linux__',
],
- ASFLAGS=[],
+ ASFLAGS=as_flags,
)
# NaClSdk environment seems to be inherited from the host environment.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698