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

Side by Side Diff: build/toolchain/mac/BUILD.gn

Issue 1335503006: [GN] Remove cflags_c from objc and cflags_cc from objcxx toolchains (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires 5 # TODO(brettw) Use "gcc_toolchain.gni" like the Linux toolchains. This requires
6 # some enhancements since the commands on Mac are slightly different than on 6 # some enhancements since the commands on Mac are slightly different than on
7 # Linux. 7 # Linux.
8 8
9 import("../goma.gni") 9 import("../goma.gni")
10 import("//build/config/ios/ios_sdk.gni") 10 import("//build/config/ios/ios_sdk.gni")
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} { {cflags_c}} -c {{source}} -o {{output}}" 75 command = "$cc -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} { {cflags_c}} -c {{source}} -o {{output}}"
76 depsformat = "gcc" 76 depsformat = "gcc"
77 description = "ASM {{output}}" 77 description = "ASM {{output}}"
78 outputs = [ 78 outputs = [
79 "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", 79 "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
80 ] 80 ]
81 } 81 }
82 82
83 tool("objc") { 83 tool("objc") {
84 depfile = "{{output}}.d" 84 depfile = "{{output}}.d"
85 command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} {{cflags_objc}} -c {{source}} -o {{output}}" 85 command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_objc}} -c {{source}} -o {{output}}"
86 depsformat = "gcc" 86 depsformat = "gcc"
87 description = "OBJC {{output}}" 87 description = "OBJC {{output}}"
88 outputs = [ 88 outputs = [
89 "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", 89 "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
90 ] 90 ]
91 } 91 }
92 92
93 tool("objcxx") { 93 tool("objcxx") {
94 depfile = "{{output}}.d" 94 depfile = "{{output}}.d"
95 command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} {{cflags_objcc}} -c {{source}} -o {{output}}" 95 command = "$cxx -MMD -MF $depfile {{defines}} {{include_dirs}} {{cflags}} {{cflags_objcc}} -c {{source}} -o {{output}}"
96 depsformat = "gcc" 96 depsformat = "gcc"
97 description = "OBJCXX {{output}}" 97 description = "OBJCXX {{output}}"
98 outputs = [ 98 outputs = [
99 "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", 99 "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o",
100 ] 100 ]
101 } 101 }
102 102
103 tool("alink") { 103 tool("alink") {
104 command = "rm -f {{output}} && ./gyp-mac-tool filter-libtool libtool -stat ic -o {{output}} {{inputs}}" 104 command = "rm -f {{output}} && ./gyp-mac-tool filter-libtool libtool -stat ic -o {{output}} {{inputs}}"
105 description = "LIBTOOL-STATIC {{output}}" 105 description = "LIBTOOL-STATIC {{output}}"
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 } 247 }
248 248
249 mac_toolchain("x64") { 249 mac_toolchain("x64") {
250 toolchain_cpu = "x64" 250 toolchain_cpu = "x64"
251 toolchain_os = "mac" 251 toolchain_os = "mac"
252 cc = "${goma_prefix}/gcc" 252 cc = "${goma_prefix}/gcc"
253 cxx = "${goma_prefix}/g++" 253 cxx = "${goma_prefix}/g++"
254 ld = cxx 254 ld = cxx
255 is_clang = false 255 is_clang = false
256 } 256 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698