| 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/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 import("//build/config/compiler/compiler.gni") | 7 import("//build/config/compiler/compiler.gni") |
| 8 import("//build/config/nacl/config.gni") | 8 import("//build/config/nacl/config.gni") |
| 9 import("//build/toolchain/cc_wrapper.gni") | 9 import("//build/toolchain/cc_wrapper.gni") |
| 10 import("//build/toolchain/toolchain.gni") | 10 import("//build/toolchain/toolchain.gni") |
| (...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 ] | 667 ] |
| 668 ldflags += [ | 668 ldflags += [ |
| 669 "-arch", | 669 "-arch", |
| 670 "x86-32-nonsfi", | 670 "x86-32-nonsfi", |
| 671 "--target=i686-unknown-nacl", | 671 "--target=i686-unknown-nacl", |
| 672 ] | 672 ] |
| 673 } else if (target_cpu == "arm") { | 673 } else if (target_cpu == "arm") { |
| 674 cflags += [ | 674 cflags += [ |
| 675 "-arch", | 675 "-arch", |
| 676 "arm-nonsfi", | 676 "arm-nonsfi", |
| 677 "-mfloat-abi=hard", |
| 677 "--pnacl-bias=arm-nonsfi", | 678 "--pnacl-bias=arm-nonsfi", |
| 678 "--target=armv7-unknown-nacl-gnueabihf", | 679 "--target=armv7-unknown-nacl-gnueabihf", |
| 679 ] | 680 ] |
| 680 ldflags += [ | 681 ldflags += [ |
| 681 "-arch", | 682 "-arch", |
| 682 "arm-nonsfi", | 683 "arm-nonsfi", |
| 683 "--target=armv7-unknown-nacl-gnueabihf", | 684 "--target=armv7-unknown-nacl-gnueabihf", |
| 684 ] | 685 ] |
| 685 } | 686 } |
| 686 } | 687 } |
| (...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1549 | 1550 |
| 1550 if (is_ios || is_mac) { | 1551 if (is_ios || is_mac) { |
| 1551 # On Mac and iOS, this enables support for ARC (automatic ref-counting). | 1552 # On Mac and iOS, this enables support for ARC (automatic ref-counting). |
| 1552 # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. | 1553 # See http://clang.llvm.org/docs/AutomaticReferenceCounting.html. |
| 1553 config("enable_arc") { | 1554 config("enable_arc") { |
| 1554 common_flags = [ "-fobjc-arc" ] | 1555 common_flags = [ "-fobjc-arc" ] |
| 1555 cflags_objc = common_flags | 1556 cflags_objc = common_flags |
| 1556 cflags_objcc = common_flags | 1557 cflags_objcc = common_flags |
| 1557 } | 1558 } |
| 1558 } | 1559 } |
| OLD | NEW |