From cf1d90578686a3d3f7cb8ef19d5fe386d34ac4ce Mon Sep 17 00:00:00 2001 From: lizzie Date: Tue, 15 Sep 2026 07:28:17 +0000 Subject: [PATCH] 2026-09-15 07:28:16 Signed-off-by: lizzie --- CMakeLists.txt | 7 ------- src/yuzu/CMakeLists.txt | 5 +++-- src/yuzu_cmd/CMakeLists.txt | 5 +++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93185eed4b..f647204a4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -153,13 +153,6 @@ if (MSVC AND ARCHITECTURE_x86) instead, run vcvars64.bat directly, located at C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build/vcvars64.bat") endif() -# Required for ICF builds -if (NOT MSVC) - add_compile_options( - $<$:-ffunction-sections> - $<$:-fdata-sections>) -endif() - if (CXX_CLANG_CL) # clang-cl prints literally 10000+ warnings without this add_compile_options( diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 7bc4c1a098..490d57f14f 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -444,9 +444,10 @@ if (YUZU_ROOM) target_link_libraries(yuzu PRIVATE yuzu-room) endif() -if (NOT MSVC) - target_link_options(yuzu PRIVATE "LINKER:--icf=all,--gc-sections") +if (LINKER STREQUAL "lld") + target_link_options(yuzu-cmd PRIVATE "LINKER:--icf=all") endif() + if (NOT MSVC AND (APPLE OR NOT YUZU_STATIC_BUILD)) # needed for vma target_compile_options(yuzu PRIVATE diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt index 6e691d84fa..11fe0e255b 100644 --- a/src/yuzu_cmd/CMakeLists.txt +++ b/src/yuzu_cmd/CMakeLists.txt @@ -67,9 +67,10 @@ endif() create_target_directory_groups(yuzu-cmd) -if (NOT MSVC) - target_link_options(yuzu-cmd PRIVATE "LINKER:--icf=all,--gc-sections") +if (LINKER STREQUAL "lld") + target_link_options(yuzu-cmd PRIVATE "LINKER:--icf=all") endif() + # needed for vma if (NOT MSVC) target_compile_options(yuzu-cmd PRIVATE