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

Unified Diff: site_scons/site_tools/naclsdk.py

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: review comments, native env 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:
View side-by-side diff with in-line comments
Download patch
Index: site_scons/site_tools/naclsdk.py
diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py
index 0ff30f136692e4096403657c8a7d36e2565048a3..5bbefaa35e3720b0dbde83bc2cf33da8d12ff536 100755
--- a/site_scons/site_tools/naclsdk.py
+++ b/site_scons/site_tools/naclsdk.py
@@ -325,6 +325,15 @@ def _SetEnvForPnacl(env, root):
TRANSLATE=pnacl_translate + arch_flag + pnacl_translate_flags,
)
+ if env.Bit('built_elsewhere'):
+ def FakeInstall(dest, source, env):
+ print 'Not installing', dest
+ env.Replace(CC='true', CXX='true', LINK='true', AR='true',
robertm 2012/03/22 14:09:37 if it is not too much work it be nice to make the
(google.com) Derek Schuff 2012/03/22 16:10:25 How would that work? Will it work if I just pass a
robertm 2012/03/22 16:18:43 not sure. another option could be CC='echo CC #'
+ RANLIB='true', AS='true', LD='true',
+ STRIP='true', INSTALL=FakeInstall,
+ #TODO(dschuff) remove this when we can translate on arm hw
+ TRANSLATE='true')
+
def _SetEnvForSdkManually(env):
def GetEnvOrDummy(v):
@@ -359,6 +368,8 @@ def PNaClForceNative(env):
LINK=cc_flags) # Already has -arch
env['LD'] = '${NATIVELD}' + arch_flag
env['SHLINK'] = '${LINK}'
+ if env.Bit('built_elsewhere'):
+ env.Replace(CC='true', CXX='true', ASPP='true', LINK='true', LD='true')
jvoung - send to chromium... 2012/03/22 00:17:45 Should this be done earlier? Mainly concerned wit
robertm 2012/03/22 14:09:37 if this ends up staying around you could unify thi
(google.com) Derek Schuff 2012/03/22 16:10:25 The change above is for the nacl environment and a
# Get an environment for a different frontend when in
# PNaCl mode.

Powered by Google App Engine
This is Rietveld 408576698