summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/uikit/bitcode.prf
diff options
context:
space:
mode:
Diffstat (limited to 'mkspecs/features/uikit/bitcode.prf')
-rw-r--r--mkspecs/features/uikit/bitcode.prf10
1 files changed, 8 insertions, 2 deletions
diff --git a/mkspecs/features/uikit/bitcode.prf b/mkspecs/features/uikit/bitcode.prf
index a1dff19eb3..df298171c0 100644
--- a/mkspecs/features/uikit/bitcode.prf
+++ b/mkspecs/features/uikit/bitcode.prf
@@ -1,7 +1,13 @@
lessThan(QMAKE_XCODE_VERSION, "7.0") {
warning("You need to update Xcode to version 7 or newer to support bitcode")
-} else {
- release:device {
+} else: !macx-xcode {
+ # Simulator builds and all debug builds SHOULD use -fembed-bitcode-marker,
+ # but unfortunately the -fembed-bitcode and -fembed-bitcode-marker driver
+ # flags do not work in conjunction with -Xarch, so we'll have to let it use
+ # the "wrong" flags for now (note that this issue affects only the Makefile
+ # generator). We also don't want the flags to be passed in Xcode builds, as
+ # the Xcode ENABLE_BITCODE setting will take care of that for us.
+ release {
QMAKE_CFLAGS += -fembed-bitcode
QMAKE_CXXFLAGS += -fembed-bitcode
QMAKE_OBJECTIVE_CFLAGS += -fembed-bitcode