Build fat binaries on iOS by default unless "ios_active_arch" is specified

This commit is contained in:
Chinmay Garde 2015-08-17 16:49:01 -07:00
parent 78579c46ff
commit 813ba5d56d

View File

@ -60,6 +60,14 @@ declare_args() {
# The patch is preapplied to the internal toolchain and hence all bots.
msvs_xtree_patched = false
}
# By default, iOS executables are fat binaries that contain armv7 and arm64
# build artifacts. This is suitable for release builds and for testing on
# older devices. However, generating fat binaries takes a very long time, and,
# depending on the application type, may be unnecessary. If the type of
# architecture is known beforehand, setting that as the active arch will
# greatly reduce build times and reduce binary sizes.
ios_active_arch = ""
}
# default_include_dirs ---------------------------------------------------------
@ -258,10 +266,19 @@ config("compiler") {
"i386",
]
} else if (current_cpu == "arm") {
common_mac_flags += [
"-arch",
"arm64",
]
if (ios_active_arch != "") {
common_mac_flags += [
"-arch",
ios_active_arch,
]
} else {
common_mac_flags += [
"-arch",
"arm64",
"-arch",
"armv7",
]
}
}
cflags += common_mac_flags