Skip to content

Commit ec6d5ac

Browse files
jnavarromlws-team
authored andcommitted
ios: Remove the support for bitcode
1 parent b351281 commit ec6d5ac

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

contrib/iOS.cmake

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
# By default this location is automatcially chosen based on the CMAKE_IOS_DEVELOPER_ROOT value.
1818
# In this case it will always be the most up-to-date SDK found in the CMAKE_IOS_DEVELOPER_ROOT path.
1919
# If set manually, this will force the use of a specific SDK version
20-
#
21-
# IOS_BITCODE = 1/0: Enable bitcode or not. Only iOS >= 6.0 device build can enable bitcode. Default is enabled.
2220

2321
# Macros:
2422
#
@@ -38,11 +36,6 @@ set (UNIX TRUE)
3836
set (APPLE TRUE)
3937
set (IOS TRUE)
4038

41-
if(NOT DEFINED IOS_BITCODE) # check xcode/clang version? since xcode 7
42-
set(IOS_BITCODE 1)
43-
endif()
44-
set(IOS_BITCODE_MARKER 0)
45-
4639
# Required as of cmake 2.8.10
4740
set (CMAKE_OSX_DEPLOYMENT_TARGET "" CACHE STRING "Force unset of the deployment target for iOS" FORCE)
4841

@@ -71,20 +64,14 @@ set (CMAKE_SHARED_MODULE_SUFFIX ".so")
7164
set (CMAKE_MODULE_EXISTS 1)
7265
set (CMAKE_DL_LIBS "")
7366

74-
if(IOS_BITCODE)
75-
set(BITCODE_FLAGS "-fembed-bitcode")
76-
elseif(IOS_BITCODE_MARKER)
77-
set(BITCODE_FLAGS "-fembed-bitcode-marker")
78-
endif()
79-
8067
set (CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ")
8168
set (CMAKE_C_OSX_CURRENT_VERSION_FLAG "-current_version ")
8269
set (CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG "${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
8370
set (CMAKE_CXX_OSX_CURRENT_VERSION_FLAG "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
8471

8572
# Hidden visibilty is required for cxx on iOS
86-
set (CMAKE_C_FLAGS_INIT "${BITCODE_FLAGS}")
87-
set (CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden ${BITCODE_FLAGS}")
73+
set (CMAKE_C_FLAGS_INIT)
74+
set (CMAKE_CXX_FLAGS_INIT "-fvisibility=hidden -fvisibility-inlines-hidden")
8875

8976
set (CMAKE_C_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
9077
set (CMAKE_CXX_LINK_FLAGS "-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")

0 commit comments

Comments
 (0)