Chromium Code Reviews| Index: SConstruct |
| diff --git a/SConstruct b/SConstruct |
| index f1ecbbed7d75053581579d28e07447e30b1564eb..6fb9470d3b9d7f3d7b1446fd77894e87ec90cbf1 100755 |
| --- a/SConstruct |
| +++ b/SConstruct |
| @@ -3122,9 +3122,9 @@ if nacl_irt_env.Bit('bitcode'): |
| # call to __nacl_read_tp, which the IRT code overrides to segregate |
| # IRT-private TLS from user TLS. |
| if nacl_irt_env.Bit('bitcode'): |
| - nacl_irt_env.Append(LINKFLAGS=['--pnacl-allow-native', |
| - '-Wt,-mtls-use-call', |
| - '-Wl,--pnacl-irt-link']) |
| + nacl_irt_env.Append(LINKFLAGS=['--pnacl-allow-native', '-Wt,-mtls-use-call']) |
| + if nacl_irt_env.Bit('target_arm'): |
| + nacl_irt_env.Append(LINKFLAGS=['-Wl,--pnacl-irt-link']) |
|
jvoung (off chromium)
2012/12/28 17:21:15
The reason we have --pnacl-irt-link, is that the I
Mark Seaborn
2012/12/28 18:06:39
Fix indentation here, then LGTM.
petarj wrote:
|
| elif nacl_irt_env.Bit('target_arm'): |
| nacl_irt_env.Append(CCFLAGS=['-mtp=soft']) |
| else: |