commit deec2f587cd0bd08ee6866d06b9600dee98af910
author Fred Baksik <fdk17@ftml.net> Wed Jul 15 15:03:45 2020 -0400
committer Fred Baksik <fred.baksik@mrcy.com> Wed Jul 29 11:51:27 2020 -0400
tree 2fb0a4ecea672c6d6718798957acf66a711f8c39
parent ca899af3e2d5af3d79d345322b300c348065f560

Toolchain: Take CMAKE_<lang>_FLAGS_INIT into account during compiler detection

Fixes: #20040

Modules/CMakeDetermineCompilerId.cmake

diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 832b18d..d7a35e1 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -14,8 +14,10 @@
   # Make sure user-specified compiler flags are used.
   if(CMAKE_${lang}_FLAGS)
     set(CMAKE_${lang}_COMPILER_ID_FLAGS ${CMAKE_${lang}_FLAGS})
-  else()
+  elseif(DEFINED ENV{${flagvar}})
     set(CMAKE_${lang}_COMPILER_ID_FLAGS $ENV{${flagvar}})
+  else(CMAKE_${lang}_FLAGS_INIT)
+    set(CMAKE_${lang}_COMPILER_ID_FLAGS ${CMAKE_${lang}_FLAGS_INIT})
   endif()
   string(REPLACE " " ";" CMAKE_${lang}_COMPILER_ID_FLAGS_LIST "${CMAKE_${lang}_COMPILER_ID_FLAGS}")