| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2013 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2013 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 """Recipes for PNaCl toolchain packages. | 6 """Recipes for PNaCl toolchain packages. |
| 7 | 7 |
| 8 Recipes consist of specially-structured dictionaries, with keys for package | 8 Recipes consist of specially-structured dictionaries, with keys for package |
| 9 name, type, commands to execute, etc. The structure is documented in the | 9 name, type, commands to execute, etc. The structure is documented in the |
| 10 PackageBuilder docstring in toolchain_main.py. | 10 PackageBuilder docstring in toolchain_main.py. |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 extra_cc_flags += ['-m32'] | 274 extra_cc_flags += ['-m32'] |
| 275 if opts.gcc or host == 'le32-nacl': | 275 if opts.gcc or host == 'le32-nacl': |
| 276 result['CFLAGS'] += extra_cc_flags | 276 result['CFLAGS'] += extra_cc_flags |
| 277 result['CXXFLAGS'] += extra_cc_flags | 277 result['CXXFLAGS'] += extra_cc_flags |
| 278 else: | 278 else: |
| 279 result['CFLAGS'] += extra_cc_flags | 279 result['CFLAGS'] += extra_cc_flags |
| 280 result['LDFLAGS'] += ['-L%(' + FlavoredName('abs_libcxx', | 280 result['LDFLAGS'] += ['-L%(' + FlavoredName('abs_libcxx', |
| 281 host, opts) + ')s/lib'] | 281 host, opts) + ')s/lib'] |
| 282 result['CXXFLAGS'] += ([ | 282 result['CXXFLAGS'] += ([ |
| 283 '-stdlib=libc++', | 283 '-stdlib=libc++', |
| 284 '-nostdinc++', |
| 284 '-I%(' + FlavoredName('abs_libcxx', host, opts) + ')s/include/c++/v1'] + | 285 '-I%(' + FlavoredName('abs_libcxx', host, opts) + ')s/include/c++/v1'] + |
| 285 extra_cc_flags) | 286 extra_cc_flags) |
| 286 deps.append(FlavoredName('libcxx', host, opts)) | 287 deps.append(FlavoredName('libcxx', host, opts)) |
| 287 return result, deps | 288 return result, deps |
| 288 | 289 |
| 289 | 290 |
| 290 def ConfigureHostArchFlags(host, extra_cflags, options, extra_configure=None, | 291 def ConfigureHostArchFlags(host, extra_cflags, options, extra_configure=None, |
| 291 use_afl_fuzz=False): | 292 use_afl_fuzz=False): |
| 292 """Return flags passed to LLVM and binutils configure for compilers and | 293 """Return flags passed to LLVM and binutils configure for compilers and |
| 293 compile flags. | 294 compile flags. |
| (...skipping 1060 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1354 SANDBOXED_TRANSLATOR_ARCHES)) | 1355 SANDBOXED_TRANSLATOR_ARCHES)) |
| 1355 | 1356 |
| 1356 tb = toolchain_main.PackageBuilder(packages, | 1357 tb = toolchain_main.PackageBuilder(packages, |
| 1357 upload_packages, | 1358 upload_packages, |
| 1358 leftover_args) | 1359 leftover_args) |
| 1359 return tb.Main() | 1360 return tb.Main() |
| 1360 | 1361 |
| 1361 | 1362 |
| 1362 if __name__ == '__main__': | 1363 if __name__ == '__main__': |
| 1363 sys.exit(main()) | 1364 sys.exit(main()) |
| OLD | NEW |