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

Unified Diff: site_scons/site_tools/naclsdk.py

Issue 329793004: Remove some unused references to the pnacl-nativeld tool (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Tweak comment Created 6 years, 6 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 | « no previous file | src/trusted/service_runtime/nacl.scons » ('j') | src/trusted/service_runtime/nacl.scons » ('J')
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 3b3df17fc14a4975983a104fdf923392ed36f879..4279b95d97e6fff1a86b310e7a95d1f95abed230 100755
--- a/site_scons/site_tools/naclsdk.py
+++ b/site_scons/site_tools/naclsdk.py
@@ -198,7 +198,6 @@ def _SetEnvForPnacl(env, root):
pnacl_cxx = binprefix + 'clang++' + binext
pnacl_ld = binprefix + 'ld' + binext
- pnacl_nativeld = binprefix + 'nativeld' + binext
pnacl_disass = binprefix + 'dis' + binext
pnacl_finalize = binprefix + 'finalize' + binext
pnacl_strip = binprefix + 'strip' + binext
@@ -252,7 +251,6 @@ def _SetEnvForPnacl(env, root):
# with shared libraries except use them with the toolchain.
SHLINK=pnacl_cxx + ld_arch_flag + pnacl_ld_flags,
LD=pnacl_ld,
- NATIVELD=pnacl_nativeld,
AR=pnacl_ar,
AS=pnacl_as + ld_arch_flag,
RANLIB=pnacl_ranlib,
@@ -288,7 +286,7 @@ def PNaClForceNative(env):
CXX=arch_flag + cc_flags,
ASPP=arch_flag + cc_flags,
LINK=cc_flags) # Already has -arch
- env['LD'] = '${NATIVELD}' + arch_flag
+ env['LD'] = 'NO-NATIVE-LD-INVOCATION-ALLOWED'
env['SHLINK'] = '${LINK}'
if env.Bit('built_elsewhere'):
_StubOutEnvToolsForBuiltElsewhere(env)
« no previous file with comments | « no previous file | src/trusted/service_runtime/nacl.scons » ('j') | src/trusted/service_runtime/nacl.scons » ('J')

Powered by Google App Engine
This is Rietveld 408576698