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

Side by Side Diff: pnacl/driver/driver_env.py

Issue 8698014: Switch to using the LLVM gold plugin as a fully linked-in object rather than DSO. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: Created 8 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 # 5 #
6 # IMPORTANT NOTE: If you make local mods to this file, you must run: 6 # IMPORTANT NOTE: If you make local mods to this file, you must run:
7 # % pnacl/build.sh driver 7 # % pnacl/build.sh driver
8 # in order for them to take effect in the scons build. This command 8 # in order for them to take effect in the scons build. This command
9 # updates the copy in the toolchain/ tree. 9 # updates the copy in the toolchain/ tree.
10 10
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 'EXEC_EXT_darwin' : '', 100 'EXEC_EXT_darwin' : '',
101 'EXEC_EXT_linux' : '', 101 'EXEC_EXT_linux' : '',
102 'EXEC_EXT_windows': '.exe', 102 'EXEC_EXT_windows': '.exe',
103 103
104 'SCONS_OS' : '${SCONS_OS_%BUILD_OS%}', 104 'SCONS_OS' : '${SCONS_OS_%BUILD_OS%}',
105 'SCONS_OS_linux' : 'linux', 105 'SCONS_OS_linux' : 'linux',
106 'SCONS_OS_darwin' : 'mac', 106 'SCONS_OS_darwin' : 'mac',
107 'SCONS_OS_windows' : 'win', 107 'SCONS_OS_windows' : 'win',
108 108
109 # Tool Pathnames 109 # Tool Pathnames
110 'GOLD_PLUGIN_SO' : '${BASE_LLVM}/${SO_DIR}/${SO_PREFIX}LLVMgold${SO_EXT}',
111 'DRAGONEGG_PLUGIN': '${BASE_GCC}/lib/dragonegg${SO_EXT}', 110 'DRAGONEGG_PLUGIN': '${BASE_GCC}/lib/dragonegg${SO_EXT}',
112 111
113 'SCONS_STAGING' : '${SCONS_STAGING_%ARCH%}', 112 'SCONS_STAGING' : '${SCONS_STAGING_%ARCH%}',
114 'SCONS_STAGING_X8632' : '${SCONS_OUT}/opt-${SCONS_OS}-x86-32/staging', 113 'SCONS_STAGING_X8632' : '${SCONS_OUT}/opt-${SCONS_OS}-x86-32/staging',
115 'SCONS_STAGING_X8664' : '${SCONS_OUT}/opt-${SCONS_OS}-x86-64/staging', 114 'SCONS_STAGING_X8664' : '${SCONS_OUT}/opt-${SCONS_OS}-x86-64/staging',
116 'SCONS_STAGING_ARM' : '${SCONS_OUT}/opt-${SCONS_OS}-arm/staging', 115 'SCONS_STAGING_ARM' : '${SCONS_OUT}/opt-${SCONS_OS}-arm/staging',
117 116
118 'SEL_UNIVERSAL_PREFIX': '${USE_EMULATOR ? ${EMULATOR}}', 117 'SEL_UNIVERSAL_PREFIX': '${USE_EMULATOR ? ${EMULATOR}}',
119 'SEL_UNIVERSAL' : '${SCONS_STAGING}/sel_universal${EXEC_EXT}', 118 'SEL_UNIVERSAL' : '${SCONS_STAGING}/sel_universal${EXEC_EXT}',
120 # NOTE: -Q skips sel_ldr qualification tests, -c -c skips validation 119 # NOTE: -Q skips sel_ldr qualification tests, -c -c skips validation
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 return (leftpart, i) 503 return (leftpart, i)
505 504
506 (middlepart, j) = self.eval_bracket_expr(s, i+2, ['}']) 505 (middlepart, j) = self.eval_bracket_expr(s, i+2, ['}'])
507 if j == len(s) or s[j] != '}': 506 if j == len(s) or s[j] != '}':
508 ParseError(s, i, j, 'Unterminated ${') 507 ParseError(s, i, j, 'Unterminated ${')
509 508
510 (rightpart, k) = self.eval_expr(s, j+1, terminators) 509 (rightpart, k) = self.eval_expr(s, j+1, terminators)
511 return (leftpart + middlepart + rightpart, k) 510 return (leftpart + middlepart + rightpart, k)
512 511
513 env = Environment() 512 env = Environment()
OLDNEW
« pnacl/build.sh ('K') | « pnacl/build.sh ('k') | pnacl/driver/pnacl-ar.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698