OLD | NEW |
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/sysroot.gni") | 5 import("//build/config/sysroot.gni") |
6 import("//build/config/mac/mac_sdk.gni") | 6 import("//build/config/mac/mac_sdk.gni") |
7 | 7 |
8 # This is included by reference in the //build/config/compiler config that | 8 # This is included by reference in the //build/config/compiler config that |
9 # is applied to all targets. It is here to separate out the logic. | 9 # is applied to all targets. It is here to separate out the logic. |
10 # | 10 # |
(...skipping 13 matching lines...) Expand all Loading... |
24 "-arch", | 24 "-arch", |
25 "i386", | 25 "i386", |
26 ] | 26 ] |
27 } else if (current_cpu == "arm") { | 27 } else if (current_cpu == "arm") { |
28 # TODO(GYP): we may need to distinguish between "arm64", "armv7", | 28 # TODO(GYP): we may need to distinguish between "arm64", "armv7", |
29 # and "armv7s" for iOS, and hence need multiple current_cpu values | 29 # and "armv7s" for iOS, and hence need multiple current_cpu values |
30 # rather than just "arm". | 30 # rather than just "arm". |
31 common_mac_flags += [ | 31 common_mac_flags += [ |
32 "-arch", | 32 "-arch", |
33 "arm64", | 33 "arm64", |
| 34 "-arch", |
| 35 "armv7", |
34 ] | 36 ] |
35 } | 37 } |
36 | 38 |
37 asmflags = common_mac_flags | 39 asmflags = common_mac_flags |
38 cflags = common_mac_flags | 40 cflags = common_mac_flags |
39 | 41 |
40 # Without this, the constructors and destructors of a C++ object inside | 42 # Without this, the constructors and destructors of a C++ object inside |
41 # an Objective C struct won't be called, which is very bad. | 43 # an Objective C struct won't be called, which is very bad. |
42 cflags_objcc = [ "-fobjc-call-cxx-cdtors" ] | 44 cflags_objcc = [ "-fobjc-call-cxx-cdtors" ] |
43 | 45 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 "-Wl,-rpath,@loader_path/../../..", | 79 "-Wl,-rpath,@loader_path/../../..", |
78 ] | 80 ] |
79 } | 81 } |
80 } | 82 } |
81 | 83 |
82 # On Mac, this is used only for executables. | 84 # On Mac, this is used only for executables. |
83 config("mac_executable_flags") { | 85 config("mac_executable_flags") { |
84 # Remove this when targeting >=10.7 since it is the default in that config. | 86 # Remove this when targeting >=10.7 since it is the default in that config. |
85 ldflags = [ "-Wl,-pie" ] # Position independent. | 87 ldflags = [ "-Wl,-pie" ] # Position independent. |
86 } | 88 } |
OLD | NEW |