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

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: tweaks needed to get base_unittests to compile Created 5 years, 5 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 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 set_default_toolchain("//build/toolchain/linux:$current_cpu") 572 set_default_toolchain("//build/toolchain/linux:$current_cpu")
573 } 573 }
574 if (is_chromeos && cros_use_custom_toolchain) { 574 if (is_chromeos && cros_use_custom_toolchain) {
575 set_default_toolchain("//build/toolchain/cros:target") 575 set_default_toolchain("//build/toolchain/cros:target")
576 } 576 }
577 } else if (is_mac) { 577 } else if (is_mac) {
578 host_toolchain = "//build/toolchain/mac:clang_x64" 578 host_toolchain = "//build/toolchain/mac:clang_x64"
579 set_default_toolchain(host_toolchain) 579 set_default_toolchain(host_toolchain)
580 } else if (is_ios) { 580 } else if (is_ios) {
581 host_toolchain = "//build/toolchain/mac:clang_x64" 581 host_toolchain = "//build/toolchain/mac:clang_x64"
582 set_default_toolchain("//build/toolchain/mac:clang_$current_cpu") 582 set_default_toolchain("//build/toolchain/mac:ios_clang_arm")
583 } else if (is_nacl) { 583 } else if (is_nacl) {
584 # TODO(GYP): This will need to change when we get NaCl working 584 # TODO(GYP): This will need to change when we get NaCl working
585 # on multiple platforms, but this whole block of code (how we define 585 # on multiple platforms, but this whole block of code (how we define
586 # host_toolchain) needs to be reworked regardless to key off of host_os 586 # host_toolchain) needs to be reworked regardless to key off of host_os
587 # and host_cpu rather than the is_* variables. 587 # and host_cpu rather than the is_* variables.
588 host_toolchain = "//build/toolchain/linux:clang_x64" 588 host_toolchain = "//build/toolchain/linux:clang_x64"
589 } 589 }
590 590
591 # ============================================================================== 591 # ==============================================================================
592 # COMPONENT SETUP 592 # COMPONENT SETUP
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
788 } 788 }
789 if (defined(invoker.testonly)) { 789 if (defined(invoker.testonly)) {
790 testonly = invoker.testonly 790 testonly = invoker.testonly
791 } 791 }
792 if (defined(invoker.visibility)) { 792 if (defined(invoker.visibility)) {
793 visibility = invoker.visibility 793 visibility = invoker.visibility
794 } 794 }
795 } 795 }
796 } 796 }
797 } 797 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698