From 9194f3c0cb880fa8a998f4af7646f059182055c4 Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Thu, 24 Sep 2015 14:55:51 -0700 Subject: [PATCH] build/make/configure.sh: Embed bitcode in arm darwin targets. When the iOS SDK major version is 9 or higher: - Pass -fembed-bitcode to compiler, assembler, and linker. - Add a warning for simulator targets since yasm doesn't know what -fembed-bitcode means, and exits with an error. BUG=https://code.google.com/p/webm/issues/detail?id=1075 Change-Id: I38c997a0225e53c5dd1b4ddf7935d21362953f76 --- build/make/configure.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/build/make/configure.sh b/build/make/configure.sh index c73e78734..8a5f56b63 100644 --- a/build/make/configure.sh +++ b/build/make/configure.sh @@ -1044,6 +1044,12 @@ EOF done asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl" + + if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then + check_add_cflags -fembed-bitcode + check_add_asflags -fembed-bitcode + check_add_ldflags -fembed-bitcode + fi ;; linux*) @@ -1253,6 +1259,13 @@ EOF enabled x86 && sim_arch="-arch i386" || sim_arch="-arch x86_64" add_cflags ${sim_arch} add_ldflags ${sim_arch} + + if [ "$(show_darwin_sdk_major_version iphonesimulator)" -gt 8 ]; then + # yasm v1.3.0 doesn't know what -fembed-bitcode means, so turning it + # on is pointless (unless building a C-only lib). Warn the user, but + # do nothing here. + log "Warning: Bitcode embed disabled for simulator targets." + fi ;; os2) add_asflags -f aout -- 2.40.0