aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-01-23 11:58:53 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-23 19:54:49 +0000
commitb48fd3cc891bf3db0c354dcb6988e244ffd0dd65 (patch)
tree3d56f427c7c46f661253198c82962f69a34e9084 /gn
parentdb8b8376b09cec9656b0ab864413b7911d81a84c (diff)
GN: add 32-bit and Release iOS builders.
And roll recipes to the point where they pass target_cpu to GN, adding x86_64 as an alias for x64. CQ_INCLUDE_TRYBOTS=skia.primary:Build-Mac-Clang-arm64-Debug-GN_iOS,Build-Mac-Clang-arm64-Release-GN_iOS,Build-Mac-Clang-arm-Debug-GN_iOS,Build-Mac-Clang-arm-Release-GN_iOS Change-Id: I1933d5803ec7f59f78576c5a7b16489362905a97 Reviewed-on: https://skia-review.googlesource.com/7403 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'gn')
-rw-r--r--gn/BUILD.gn13
-rw-r--r--gn/BUILDCONFIG.gn3
2 files changed, 12 insertions, 4 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 97e5368fdb..ec3a1f1ee3 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -186,18 +186,22 @@ config("default") {
}
if (is_ios) {
+ _target = target_cpu
+ if (target_cpu == "arm") {
+ _target = "armv7"
+ }
cflags += [
"-isysroot",
ios_sysroot,
"-arch",
- target_cpu,
+ _target,
]
cflags_cc += [ "-stdlib=libc++" ]
ldflags += [
"-isysroot",
ios_sysroot,
"-arch",
- target_cpu,
+ _target,
"-stdlib=libc++",
]
libs += [ "objc" ]
@@ -288,8 +292,9 @@ config("warnings") {
"-Wno-unknown-warning-option", # Let older Clangs ignore newer Clangs' warnings.
]
- if (is_android && target_cpu == "x86") {
- # Clang seems to think new/malloc will only be 4-byte aligned on x86 Android.
+ if ((target_cpu == "x86" && is_android) ||
+ (target_cpu == "arm" && is_ios)) {
+ # Clang seems to think new/malloc will only be 4-byte aligned on x86 Android and 32-bit iOS.
# We're pretty sure it's actually 8-byte alignment.
cflags += [ "-Wno-over-aligned" ]
}
diff --git a/gn/BUILDCONFIG.gn b/gn/BUILDCONFIG.gn
index 23e5288f1a..a89931b432 100644
--- a/gn/BUILDCONFIG.gn
+++ b/gn/BUILDCONFIG.gn
@@ -48,6 +48,9 @@ if (target_cpu == "") {
target_cpu = "arm64"
}
}
+if (target_cpu == "x86_64") {
+ target_cpu = "x64"
+}
if (current_cpu == "") {
current_cpu = target_cpu
}