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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 # LLVM's linux->mingw cross build needs this | 218 # LLVM's linux->mingw cross build needs this |
219 configure_args.append('CC_FOR_BUILD=gcc') | 219 configure_args.append('CC_FOR_BUILD=gcc') |
220 else: | 220 else: |
221 if TripleIsMac(host): | 221 if TripleIsMac(host): |
222 # This is required for building with recent libc++ against OSX 10.6 | 222 # This is required for building with recent libc++ against OSX 10.6 |
223 extra_cflags.append('-U__STRICT_ANSI__') | 223 extra_cflags.append('-U__STRICT_ANSI__') |
224 if options.gcc or host == 'le32-nacl': | 224 if options.gcc or host == 'le32-nacl': |
225 configure_args.extend(['CFLAGS=' + ' '.join(extra_cflags), | 225 configure_args.extend(['CFLAGS=' + ' '.join(extra_cflags), |
226 'CXXFLAGS=' + ' '.join(extra_cflags)]) | 226 'CXXFLAGS=' + ' '.join(extra_cflags)]) |
227 else: | 227 else: |
| 228 # TODO(jvoung): Remove this after merging LLVM to be cleaner |
| 229 # w.r.t. -Winconsistent-missing-override. |
| 230 # https://code.google.com/p/nativeclient/issues/detail?id=4026 |
| 231 if not options.gcc: |
| 232 extra_cflags.append('-Wno-inconsistent-missing-override') |
228 configure_args.extend( | 233 configure_args.extend( |
229 ['CFLAGS=' + ' '.join(extra_cflags), | 234 ['CFLAGS=' + ' '.join(extra_cflags), |
230 'LDFLAGS=-L%(' + GSDJoin('abs_libcxx', host) + ')s/lib', | 235 'LDFLAGS=-L%(' + GSDJoin('abs_libcxx', host) + ')s/lib', |
231 'CXXFLAGS=-stdlib=libc++ -I%(' + GSDJoin('abs_libcxx', host) + | 236 'CXXFLAGS=-stdlib=libc++ -I%(' + GSDJoin('abs_libcxx', host) + |
232 ')s/include/c++/v1 ' + ' '.join(extra_cflags)]) | 237 ')s/include/c++/v1 ' + ' '.join(extra_cflags)]) |
233 | 238 |
234 return configure_args | 239 return configure_args |
235 | 240 |
236 | 241 |
237 def LibCxxHostArchFlags(host): | 242 def LibCxxHostArchFlags(host): |
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1087 'x86-32-%s' % pynacl.platform.GetOS(), unsandboxed_irt_canonical)) | 1092 'x86-32-%s' % pynacl.platform.GetOS(), unsandboxed_irt_canonical)) |
1088 | 1093 |
1089 if args.build_sbtc and not args.pnacl_in_pnacl: | 1094 if args.build_sbtc and not args.pnacl_in_pnacl: |
1090 packages.update(pnacl_sandboxed_translator.SandboxedTranslators( | 1095 packages.update(pnacl_sandboxed_translator.SandboxedTranslators( |
1091 SANDBOXED_TRANSLATOR_ARCHES)) | 1096 SANDBOXED_TRANSLATOR_ARCHES)) |
1092 | 1097 |
1093 tb = toolchain_main.PackageBuilder(packages, | 1098 tb = toolchain_main.PackageBuilder(packages, |
1094 upload_packages, | 1099 upload_packages, |
1095 leftover_args) | 1100 leftover_args) |
1096 tb.Main() | 1101 tb.Main() |
OLD | NEW |