Commit 4d7a267e authored by chinmaygarde's avatar chinmaygarde Committed by Commit bot

Update build configuration to support iOS targets

Review URL: https://codereview.chromium.org/1130153009

Cr-Commit-Position: refs/heads/master@{#330643}
parent 05df5682
......@@ -3,7 +3,8 @@
# found in the LICENSE file.
# TODO(GYP): Make tcmalloc work on win.
if (is_android || current_cpu == "mipsel" || is_mac || is_asan || is_win) {
if (is_android || current_cpu == "mipsel" || is_mac || is_ios || is_asan ||
is_win) {
_default_allocator = "none"
} else {
_default_allocator = "tcmalloc"
......
......@@ -28,6 +28,11 @@ if (current_cpu == "arm") {
arm_use_neon = false
arm_optionally_use_neon = true
}
if (is_ios) {
arm_use_neon = false
arm_optionally_use_neon = false
}
}
assert(arm_float_abi == "" || arm_float_abi == "hard" ||
......
......@@ -125,7 +125,7 @@ config("compiler") {
}
# Linker warnings.
if (!(is_chromeos && current_cpu == "arm") && !is_mac) {
if (!(is_chromeos && current_cpu == "arm") && !is_mac && !is_ios) {
# TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
ldflags += [ "-Wl,--fatal-warnings" ]
}
......@@ -186,6 +186,11 @@ config("compiler") {
"-arch",
"i386",
]
} else if (current_cpu == "arm") {
common_mac_flags += [
"-arch",
"armv7",
]
}
cflags += common_mac_flags
......@@ -493,7 +498,7 @@ config("compiler") {
}
config("compiler_arm_fpu") {
if (current_cpu == "arm") {
if (current_cpu == "arm" && !is_ios) {
cflags = [ "-mfpu=$arm_fpu" ]
}
}
......
......@@ -11,12 +11,12 @@ config("sdk") {
sysroot,
]
cflags = common_flags
ldflags = common_flags
if (use_ios_simulator) {
cflags += [ "-mios-simulator-version-min=$ios_deployment_target" ]
common_flags += [ "-mios-simulator-version-min=$ios_deployment_target" ]
} else {
cflags += [ "-miphoneos-version-min=$ios_deployment_target" ]
common_flags += [ "-miphoneos-version-min=$ios_deployment_target" ]
}
cflags = common_flags
ldflags = common_flags
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment