From 74bb4ad5d4eb08f997a94b92d4e4eb27d48591b2 Mon Sep 17 00:00:00 2001 From: Yuanfang Chen Date: Wed, 5 Jan 2022 17:21:46 -0800 Subject: [PATCH] Consider CMAKE_{t}_LINKER_FLAGS_ when passing -gcodeview-ghash CMake may add /Debug in the CONFIG-specific flag. Reviewed By: rnk Differential Revision: https://reviews.llvm.org/D116710 --- llvm/cmake/modules/HandleLLVMOptions.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index 0280e17..3d3be96 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -488,8 +488,13 @@ if( MSVC ) endif() # Get all linker flags in upper case form so we can search them. - set(all_linker_flags_uppercase - "${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS}") + string(CONCAT all_linker_flags_uppercase + ${CMAKE_EXE_LINKER_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} + ${CMAKE_EXE_LINKER_FLAGS} + ${CMAKE_MODULE_LINKER_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} + ${CMAKE_MODULE_LINKER_FLAGS} + ${CMAKE_SHARED_LINKER_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} + ${CMAKE_SHARED_LINKER_FLAGS}) string(TOUPPER "${all_linker_flags_uppercase}" all_linker_flags_uppercase) if (CLANG_CL AND LINKER_IS_LLD) -- 2.7.4