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

Side by Side Diff: build/config/compiler/BUILD.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: 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 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 if (current_cpu == "arm") { 7 if (current_cpu == "arm") {
8 import("//build/config/arm.gni") 8 import("//build/config/arm.gni")
9 } 9 }
10 if (current_cpu == "mipsel" || current_cpu == "mips64el") { 10 if (current_cpu == "mipsel" || current_cpu == "mips64el") {
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
257 "x86_64", 257 "x86_64",
258 ] 258 ]
259 } else if (current_cpu == "x86") { 259 } else if (current_cpu == "x86") {
260 common_mac_flags += [ 260 common_mac_flags += [
261 "-arch", 261 "-arch",
262 "i386", 262 "i386",
263 ] 263 ]
264 } else if (current_cpu == "arm") { 264 } else if (current_cpu == "arm") {
265 common_mac_flags += [ 265 common_mac_flags += [
266 "-arch", 266 "-arch",
267 "armv7", 267 "arm64",
268 ] 268 ]
269 } 269 }
270 270
271 cflags += common_mac_flags 271 cflags += common_mac_flags
272 272
273 # Without this, the constructors and destructors of a C++ object inside 273 # Without this, the constructors and destructors of a C++ object inside
274 # an Objective C struct won't be called, which is very bad. 274 # an Objective C struct won't be called, which is very bad.
275 cflags_objcc += [ "-fobjc-call-cxx-cdtors" ] 275 cflags_objcc += [ "-fobjc-call-cxx-cdtors" ]
276 276
277 cflags_c += [ "-std=c99" ] 277 cflags_c += [ "-std=c99" ]
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
1258 cflags += [ "-gsplit-dwarf" ] 1258 cflags += [ "-gsplit-dwarf" ]
1259 } 1259 }
1260 } 1260 }
1261 } 1261 }
1262 1262
1263 config("no_symbols") { 1263 config("no_symbols") {
1264 if (!is_win) { 1264 if (!is_win) {
1265 cflags = [ "-g0" ] 1265 cflags = [ "-g0" ]
1266 } 1266 }
1267 } 1267 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698