Skip to content
Snippets Groups Projects
Commit 3041fa4d authored by Alexandre Janniaux's avatar Alexandre Janniaux
Browse files

contrib: vpx: allow compiling without bitcode

As vpx buildsystem adds -fembed-bitcode as long as iphone target is > 8
it makes the build fails on compilers not supporting bitcode embedding.

In any case, we enable bitcode embedding ourselves by adding it to the
contribs CFLAGS, which ends up in --extra-cflags in vpx.
parent 14bd15da
No related branches found
No related tags found
No related merge requests found
diff --git a/build/make/configure.sh b/build/make/configure.sh
index d05d0fa12..0ebf74039 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -1129,12 +1129,6 @@ EOF
fi
;;
esac
-
- 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
fi
asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl"
......@@ -21,6 +21,9 @@ ifdef HAVE_ANDROID
cp "${ANDROID_NDK}"/sources/android/cpufeatures/cpu-features.c $(UNPACK_DIR)/vpx_ports
cp "${ANDROID_NDK}"/sources/android/cpufeatures/cpu-features.h $(UNPACK_DIR)
endif
# Disable automatic addition of -fembed-bitcode for iOS
# as it is enabled through --extra-cflags if necessary.
$(APPLY) $(SRC)/vpx/libvpx-remove-bitcode.patch
$(MOVE)
DEPS_vpx =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment