Chromium Code Reviews| Index: SConstruct |
| diff --git a/SConstruct b/SConstruct |
| index 51d28dc3e15d2b5916cf3b1205ffea1cbdff2134..9ecfd544020931d30e6dc32e06af068feceb3810 100755 |
| --- a/SConstruct |
| +++ b/SConstruct |
| @@ -3024,8 +3024,11 @@ def AllowInlineAssembly(env): |
| # only current ARM toolchain. One day, we will have an ARM GCC |
| # toolchain, and we will no longer need to use inline assembly |
| # with PNaCl/Clang at all. |
| - if not (env.Bit('target_arm') or env.Bit('target_mips32')): |
| - return False |
| + # |
| + # For Non-SFI NaCl we use inline assembly in PNaCl/Clang. |
| + if not (env.Bit('target_arm') or env.Bit('target_mips32') |
| + or env.Bit('nonsfi_nacl')): |
| + return False |
|
Mark Seaborn
2014/09/30 04:59:13
Nit: fix indentation (remove 1 space)
Junichi Uekawa
2014/09/30 06:55:56
Done.
|
| # Inline assembly does not work in pexes. |
| if env.Bit('pnacl_generate_pexe'): |
| return False |