Skip to content

Commit 7cecd48

Browse files
Don't embed bitcode on tvOS anymore (#79349)
Co-authored-by: Michal Strehovský <MichalStrehovsky@users.noreply.github.com>
1 parent 9333e46 commit 7cecd48

File tree

3 files changed

+2
-20
lines changed

3 files changed

+2
-20
lines changed

eng/native/configurecompiler.cmake

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -480,11 +480,8 @@ if (CLR_CMAKE_HOST_UNIX)
480480
# We mark the function which needs exporting with DLLEXPORT
481481
add_compile_options(-fvisibility=hidden)
482482

483-
# Separate functions so linker can remove them. But not on tvOS because
484-
# -ffunction-sections is not supported with -fembed-bitcode.
485-
if (NOT CLR_CMAKE_HOST_TVOS)
486-
add_compile_options(-ffunction-sections)
487-
endif()
483+
# Separate functions so linker can remove them.
484+
add_compile_options(-ffunction-sections)
488485

489486
# Specify the minimum supported version of macOS
490487
# Mac Catalyst needs a special CFLAG, exclusive with mmacosx-version-min

src/mono/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "iOS" OR CMAKE_SYSTEM_NAME STREQUAL "tvOS")
193193
set(HOST_IOS 1)
194194
if(CMAKE_SYSTEM_NAME STREQUAL "tvOS")
195195
set(HOST_TVOS 1)
196-
# with -fembed-bitcode passing -headerpad_max_install_names is not allowed so remove it from the CMake flags
197-
string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS})
198-
string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS})
199-
string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
200-
string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS})
201-
add_compile_options(-fembed-bitcode)
202-
add_link_options(-fembed-bitcode)
203196
endif()
204197
set(PTHREAD_POINTER_ID 1)
205198
set(USE_MACH_SEMA 1)

src/native/libs/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER)
5353
set(STATIC_LIB_DESTINATION .)
5454
endif ()
5555

56-
if (CLR_CMAKE_TARGET_TVOS)
57-
# with -fembed-bitcode passing -headerpad_max_install_names is not allowed so remove it from the CMake flags
58-
string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_C_LINK_FLAGS ${CMAKE_C_LINK_FLAGS})
59-
string(REPLACE "-Wl,-headerpad_max_install_names" "" CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS ${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS})
60-
add_compile_options(-fembed-bitcode)
61-
add_link_options(-fembed-bitcode)
62-
endif ()
63-
6456
if (CLR_CMAKE_TARGET_ANDROID)
6557
if (CROSS_ROOTFS)
6658
include_directories(SYSTEM "${CROSS_ROOTFS}/usr/include")

0 commit comments

Comments
 (0)