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

Unified Diff: pnacl/driver/nativeld.py

Issue 454593002: PNaCl driver: Add libgcc to mixed native/bitcode links (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: explicitly modify env rather than using var expansion Created 6 years, 4 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 | « pnacl/driver/driver_env.py ('k') | pnacl/driver/pnacl-driver.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pnacl/driver/nativeld.py
diff --git a/pnacl/driver/nativeld.py b/pnacl/driver/nativeld.py
index 0a044ecad782d294b236531852a22d909010f005..ecdf9fcf22aa9e01aa85c54f9e6cc132fd56ee0a 100755
--- a/pnacl/driver/nativeld.py
+++ b/pnacl/driver/nativeld.py
@@ -55,15 +55,7 @@ EXTRA_ENV = {
'SEARCH_DIRS' : '${SEARCH_DIRS_USER} ${SEARCH_DIRS_BUILTIN}',
'SEARCH_DIRS_USER' : '',
- 'SEARCH_DIRS_BUILTIN': '${USE_STDLIB ? ${LIBS_ARCH}/}',
-
- 'LIBS_ARCH' : '${LIBS_%ARCH%}',
- 'LIBS_ARM' : '${BASE_LIB_NATIVE}arm',
- 'LIBS_ARM_NONSFI' : '${BASE_LIB_NATIVE}arm-nonsfi',
- 'LIBS_X8632' : '${BASE_LIB_NATIVE}x86-32',
- 'LIBS_X8632_NONSFI': '${BASE_LIB_NATIVE}x86-32-nonsfi',
- 'LIBS_X8664' : '${BASE_LIB_NATIVE}x86-64',
- 'LIBS_MIPS32' : '${BASE_LIB_NATIVE}mips32',
+ 'SEARCH_DIRS_BUILTIN': '${USE_STDLIB ? ${LIBS_NATIVE_ARCH}/}',
# Note: this is only used in the unsandboxed case
'RUN_LD' : '${LD} ${LD_FLAGS} ${inputs} -o ${output}'
« no previous file with comments | « pnacl/driver/driver_env.py ('k') | pnacl/driver/pnacl-driver.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698