Chromium Code Reviews| Index: pnacl/driver/pnacl-translate.py |
| diff --git a/pnacl/driver/pnacl-translate.py b/pnacl/driver/pnacl-translate.py |
| index b03eb7cfe62e8abb9cb0cfc34e3c25a31dcd7fc0..df3105c33f7855e61187ce662667621ef6beb793 100755 |
| --- a/pnacl/driver/pnacl-translate.py |
| +++ b/pnacl/driver/pnacl-translate.py |
| @@ -354,14 +354,13 @@ def main(argv): |
| # do module splitting when using it. |
| env.set('SPLIT_MODULE', '1') |
| else: |
| - modules = env.getone('SPLIT_MODULE') |
| - if modules != '1': |
| - env.append('LLC_FLAGS_EXTRA', '-split-module=' + modules) |
| - env.append('LD_FLAGS', '-split-module=' + modules) |
| + # Do not set -streaming-bitcode for sandboxed mode, because it is already |
| + # in the default command line. |
| if not env.getbool('SANDBOXED') and env.getbool('STREAM_BITCODE'): |
|
jvoung (off chromium)
2014/12/02 16:24:08
Had to revert this bit to stay within the "else:".
|
| - # Do not set -streaming-bitcode for sandboxed mode, because it is already |
| - # in the default command line. |
| env.append('LLC_FLAGS_EXTRA', '-streaming-bitcode') |
| + modules = env.getone('SPLIT_MODULE') |
| + env.append('LLC_FLAGS_EXTRA', '-split-module=' + modules) |
| + env.append('LD_FLAGS', '-split-module=' + modules) |
| # If there's a bitcode file, translate it now. |
| tng = driver_tools.TempNameGen(inputs + bcfiles, output) |