summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-05-19 12:45:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-08-04 11:21:04 +0200
commit00e2201264e3839570fbf64817eeca931a630b01 (patch)
tree31757a5be2aac9b23d143701b6275d83d33de1a5 /cmake
parentfae023b184f6c044e85f4ca6052c306d519e2e85 (diff)
downloadqtwebengine-00e2201264e3839570fbf64817eeca931a630b01.tar.gz
Adaptations for Chromium 102
Pick-to: 6.4 Change-Id: I7ef0ad616f2ea0fae482253335e95998aa2d360e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Functions.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index cf8fb2d79..f92dfc48d 100644
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -434,6 +434,8 @@ function(add_linker_options target buildDir completeStatic)
set_target_properties(${cmakeTarget} PROPERTIES STATIC_LIBRARY_OPTIONS "@${objects_rsp}")
if(LINUX)
target_link_options(${cmakeTarget} PRIVATE "$<$<CONFIG:${config}>:@${objects_rsp}>")
+ # Chromium is meant for linking with gc-sections, which seems to not always get applied otherwise
+ target_link_options(${cmakeTarget} PRIVATE "-Wl,--gc-sections")
if(NOT completeStatic)
target_link_libraries(${cmakeTarget} PRIVATE
"$<1:-Wl,--start-group $<$<CONFIG:${config}>:@${archives_rsp}> -Wl,--end-group>"
@@ -836,7 +838,7 @@ macro(append_build_type_setup)
#TODO: refactor to not check for IOS here
if(NOT QT_FEATURE_webengine_full_debug_info AND NOT IOS)
- list(APPEND gnArgArg blink_symbol_level=0 remove_v8base_debug_symbols=true)
+ list(APPEND gnArgArg blink_symbol_level=0 v8_symbol_level=0)
endif()
extend_gn_list(gnArgArg ARGS use_jumbo_build CONDITION QT_FEATURE_webengine_jumbo_build)