[llvm] 74bb4ad - Consider CMAKE_{t}_LINKER_FLAGS_<CONFIG> when passing -gcodeview-ghash

[Yuanfang Chen via llvm-commits]

Author: Yuanfang Chen
Date: 2022-01-05T17:22:11-08:00
New Revision: 74bb4ad5d4eb08f997a94b92d4e4eb27d48591b2

URL: https://github.com/llvm/llvm-project/commit/74bb4ad5d4eb08f997a94b92d4e4eb27d48591b2
DIFF: https://github.com/llvm/llvm-project/commit/74bb4ad5d4eb08f997a94b92d4e4eb27d48591b2.diff

LOG: Consider CMAKE_{t}_LINKER_FLAGS_<CONFIG> when passing -gcodeview-ghash

CMake may add /Debug in the CONFIG-specific flag.

Reviewed By: rnk

Differential Revision: https://reviews.llvm.org/D116710

Added: 
    

Modified: 
    llvm/cmake/modules/HandleLLVMOptions.cmake

Removed: 
    


################################################################################
diff  --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake
index 0280e1746ab04..3d3be961a6755 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)