DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2544 from chinmaygarde/master

Browse Source 
Add a ios_clang_x64 toolchain definition for iOS simulator builds
This commit is contained in:
Chinmay Garde 2016-03-23 12:57:42 -07:00
commit 4ffc564a6f
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/config/BUILDCONFIG.gn
View File

@ -605,7 +605,11 @@ if (is_win) {
set_default_toolchain(host_toolchain)
} else if (is_ios) {
host_toolchain = "//build/toolchain/mac:clang_x64"
set_default_toolchain("//build/toolchain/mac:ios_clang_arm")
if (use_ios_simulator) {
set_default_toolchain("//build/toolchain/mac:ios_clang_x64")
} else {
set_default_toolchain("//build/toolchain/mac:ios_clang_arm")
}
} else if (is_nacl) {
# TODO(GYP): This will need to change when we get NaCl working
# on multiple platforms, but this whole block of code (how we define

6
build/config/ios/BUILD.gn
View File

@ -6,4 +6,10 @@ import("//build/config/sysroot.gni")
import("//build/config/ios/ios_sdk.gni")
config("sdk") {
common_flags = [
"-stdlib=libc++",
]
cflags = common_flags
ldflags = common_flags
}

1
build/config/sysroot.gni
View File

@ -51,7 +51,6 @@ if (current_toolchain == default_toolchain && target_sysroot != "") {
}
} else if (is_mac) {
import("//build/config/mac/mac_sdk.gni")
sysroot = mac_sdk_path
} else if (is_ios) {
import("//build/config/ios/ios_sdk.gni")

33
build/toolchain/mac/BUILD.gn
View File

@ -38,8 +38,6 @@ template("mac_toolchain") {
"mac_toolchain() must specify a \"toolchain_cpu\"")
assert(defined(invoker.toolchain_os),
"mac_toolchain() must specify a \"toolchain_os\"")
assert(defined(invoker.switch_sysroot),
"mac_toolchain() must specify a \"switch_sysroot\"")
# We can't do string interpolation ($ in strings) on things with dots in
# them. To allow us to use $cc below, for example, we create copies of
@ -54,16 +52,8 @@ template("mac_toolchain") {
sysroot_flags = ""
if (invoker.switch_sysroot) {
version_flags = ""
if (use_ios_simulator) {
version_flags = "-mios-simulator-version-min=$ios_deployment_target"
} else {
version_flags = "-miphoneos-version-min=$ios_deployment_target"
}
sysroot_flags = "-isysroot $sysroot $version_flags"
if (defined(invoker.sysroot_flags)) {
sysroot_flags = invoker.sysroot_flags
}
toolchain_flags = ""
@ -226,7 +216,6 @@ mac_toolchain("clang_arm") {
cxx = "${goma_prefix}$prefix/clang++"
ld = cxx
is_clang = true
switch_sysroot = false
}
mac_toolchain("ios_clang_arm") {
@ -238,7 +227,19 @@ mac_toolchain("ios_clang_arm") {
cxx = "${goma_prefix}$prefix/clang++"
ld = cxx
is_clang = true
switch_sysroot = true
sysroot_flags = "-isysroot $sysroot -miphoneos-version-min=$ios_deployment_target"
}
mac_toolchain("ios_clang_x64") {
toolchain_cpu = "x64"
toolchain_os = "mac"
prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
root_build_dir)
cc = "${goma_prefix}$prefix/clang"
cxx = "${goma_prefix}$prefix/clang++"
ld = cxx
is_clang = true
sysroot_flags = "-isysroot $sysroot -mios-simulator-version-min=$ios_deployment_target"
}
mac_toolchain("arm") {
@ -248,7 +249,6 @@ mac_toolchain("arm") {
cxx = "${goma_prefix}/g++"
ld = cxx
is_clang = false
switch_sysroot = false
}
mac_toolchain("clang_x64") {
@ -260,7 +260,6 @@ mac_toolchain("clang_x64") {
cxx = "${goma_prefix}$prefix/clang++"
ld = cxx
is_clang = true
switch_sysroot = false
}
mac_toolchain("clang_i386") {
@ -272,7 +271,6 @@ mac_toolchain("clang_i386") {
cxx = "${goma_prefix}$prefix/clang++"
ld = cxx
is_clang = true
switch_sysroot = false
}
@ -283,5 +281,4 @@ mac_toolchain("x64") {
cxx = "${goma_prefix}/g++"
ld = cxx
is_clang = false
switch_sysroot = false
}