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

Side by Side Diff: build/config/BUILDCONFIG.gn

Issue 877553008: Land prep work to enable NaCl in the Linux x64 GN builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up for review 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # ============================================================================= 5 # =============================================================================
6 # BUILD FLAGS 6 # BUILD FLAGS
7 # ============================================================================= 7 # =============================================================================
8 # 8 #
9 # This block lists input arguments to the build, along with their default 9 # This block lists input arguments to the build, along with their default
10 # values. GN requires listing them explicitly so it can validate input and have 10 # values. GN requires listing them explicitly so it can validate input and have
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 } 506 }
507 if (is_chromeos && cros_use_custom_toolchain) { 507 if (is_chromeos && cros_use_custom_toolchain) {
508 set_default_toolchain("//build/toolchain/cros:target") 508 set_default_toolchain("//build/toolchain/cros:target")
509 } 509 }
510 } else if (is_mac) { 510 } else if (is_mac) {
511 host_toolchain = "//build/toolchain/mac:clang" 511 host_toolchain = "//build/toolchain/mac:clang"
512 set_default_toolchain(host_toolchain) 512 set_default_toolchain(host_toolchain)
513 } else if (is_ios) { 513 } else if (is_ios) {
514 host_toolchain = "//build/toolchain/mac:host_clang" 514 host_toolchain = "//build/toolchain/mac:host_clang"
515 set_default_toolchain("//build/toolchain/mac:clang") 515 set_default_toolchain("//build/toolchain/mac:clang")
516 } else if (is_nacl) {
517 # TODO(dpranke): This will need to change when we get NaCl working
518 # on multiple platforms, but this whole block of code (how we define
519 # host_toolchain) needs to be reworked regardless to key off of build_os
520 # and build_cpu_arch rather than the is_* variables.
521 host_toolchain = "//build/toolchain/linux:clang_x64"
Nick Bray (chromium) 2015/02/05 23:21:45 Note: this hack would cause the NaCl bots to blow
Dirk Pranke 2015/02/05 23:52:19 True. However, I need to rework this whole section
516 } 522 }
517 523
518 # ============================================================================== 524 # ==============================================================================
519 # COMPONENT SETUP 525 # COMPONENT SETUP
520 # ============================================================================== 526 # ==============================================================================
521 527
522 # TODO(brettw) erase this once the built-in "component" function is removed. 528 # TODO(brettw) erase this once the built-in "component" function is removed.
523 if (is_component_build) { 529 if (is_component_build) {
524 component_mode = "shared_library" 530 component_mode = "shared_library"
525 } else { 531 } else {
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 } 721 }
716 if (defined(invoker.testonly)) { 722 if (defined(invoker.testonly)) {
717 testonly = invoker.testonly 723 testonly = invoker.testonly
718 } 724 }
719 if (defined(invoker.visibility)) { 725 if (defined(invoker.visibility)) {
720 visibility = invoker.visibility 726 visibility = invoker.visibility
721 } 727 }
722 } 728 }
723 } 729 }
724 } 730 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698