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

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

Issue 1250913002: patch from chinmaygarde@ to make progress on mac, ios. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge to #341416 Created 5 years, 4 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 # PLATFORM SELECTION 6 # PLATFORM SELECTION
7 # ============================================================================= 7 # =============================================================================
8 # 8 #
9 # There are two main things to set: "os" and "cpu". The "toolchain" is the name 9 # There are two main things to set: "os" and "cpu". The "toolchain" is the name
10 # of the GN thing that encodes combinations of these things. 10 # of the GN thing that encodes combinations of these things.
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
584 set_default_toolchain("//build/toolchain/linux:$current_cpu") 584 set_default_toolchain("//build/toolchain/linux:$current_cpu")
585 } 585 }
586 if (is_chromeos && cros_use_custom_toolchain) { 586 if (is_chromeos && cros_use_custom_toolchain) {
587 set_default_toolchain("//build/toolchain/cros:target") 587 set_default_toolchain("//build/toolchain/cros:target")
588 } 588 }
589 } else if (is_mac) { 589 } else if (is_mac) {
590 host_toolchain = "//build/toolchain/mac:clang_x64" 590 host_toolchain = "//build/toolchain/mac:clang_x64"
591 set_default_toolchain(host_toolchain) 591 set_default_toolchain(host_toolchain)
592 } else if (is_ios) { 592 } else if (is_ios) {
593 host_toolchain = "//build/toolchain/mac:clang_x64" 593 host_toolchain = "//build/toolchain/mac:clang_x64"
594 set_default_toolchain("//build/toolchain/mac:clang_$current_cpu") 594 set_default_toolchain("//build/toolchain/mac:ios_clang_arm")
595 } else if (is_nacl) { 595 } else if (is_nacl) {
596 # TODO(GYP): This will need to change when we get NaCl working 596 # TODO(GYP): This will need to change when we get NaCl working
597 # on multiple platforms, but this whole block of code (how we define 597 # on multiple platforms, but this whole block of code (how we define
598 # host_toolchain) needs to be reworked regardless to key off of host_os 598 # host_toolchain) needs to be reworked regardless to key off of host_os
599 # and host_cpu rather than the is_* variables. 599 # and host_cpu rather than the is_* variables.
600 host_toolchain = "//build/toolchain/linux:clang_x64" 600 host_toolchain = "//build/toolchain/linux:clang_x64"
601 } 601 }
602 602
603 # ============================================================================== 603 # ==============================================================================
604 # COMPONENT SETUP 604 # COMPONENT SETUP
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 } 794 }
795 if (defined(invoker.testonly)) { 795 if (defined(invoker.testonly)) {
796 testonly = invoker.testonly 796 testonly = invoker.testonly
797 } 797 }
798 if (defined(invoker.visibility)) { 798 if (defined(invoker.visibility)) {
799 visibility = invoker.visibility 799 visibility = invoker.visibility
800 } 800 }
801 } 801 }
802 } 802 }
803 } 803 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698