Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: toolchain_build/toolchain_build_pnacl.py

Issue 800553003: Update PNaCl to LLVM/Clang/Libcxx 223109 (nacl-change) (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: fix rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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')
233 configure_args.extend( 228 configure_args.extend(
234 ['CFLAGS=' + ' '.join(extra_cflags), 229 ['CFLAGS=' + ' '.join(extra_cflags),
235 'LDFLAGS=-L%(' + GSDJoin('abs_libcxx', host) + ')s/lib', 230 'LDFLAGS=-L%(' + GSDJoin('abs_libcxx', host) + ')s/lib',
236 'CXXFLAGS=-stdlib=libc++ -I%(' + GSDJoin('abs_libcxx', host) + 231 'CXXFLAGS=-stdlib=libc++ -I%(' + GSDJoin('abs_libcxx', host) +
237 ')s/include/c++/v1 ' + ' '.join(extra_cflags)]) 232 ')s/include/c++/v1 ' + ' '.join(extra_cflags)])
238 233
239 return configure_args 234 return configure_args
240 235
241 236
242 def LibCxxHostArchFlags(host): 237 def LibCxxHostArchFlags(host):
(...skipping 848 matching lines...) Expand 10 before | Expand all | Expand 10 after
1091 'x86-32-%s' % pynacl.platform.GetOS(), unsandboxed_irt_canonical)) 1086 'x86-32-%s' % pynacl.platform.GetOS(), unsandboxed_irt_canonical))
1092 1087
1093 if args.build_sbtc and not args.pnacl_in_pnacl: 1088 if args.build_sbtc and not args.pnacl_in_pnacl:
1094 packages.update(pnacl_sandboxed_translator.SandboxedTranslators( 1089 packages.update(pnacl_sandboxed_translator.SandboxedTranslators(
1095 SANDBOXED_TRANSLATOR_ARCHES)) 1090 SANDBOXED_TRANSLATOR_ARCHES))
1096 1091
1097 tb = toolchain_main.PackageBuilder(packages, 1092 tb = toolchain_main.PackageBuilder(packages,
1098 upload_packages, 1093 upload_packages,
1099 leftover_args) 1094 leftover_args)
1100 tb.Main() 1095 tb.Main()
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698