Merge pull request #16005 from troughton/not-release-is-not-debug

Author: swift-ci

cmake/modules/AddSwift.cmake

@@ -227,12 +227,12 @@ function(_add_variant_c_compile_flags)
     if(NOT "${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
       list(APPEND result -Xclang;--dependent-lib=oldnames)
       # TODO(compnerd) handle /MT, /MTd, /MD, /MDd
-      if("${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE")
-        list(APPEND result "-D_MD")
-        list(APPEND result -Xclang;--dependent-lib=msvcrt)
-      else()
+      if("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
         list(APPEND result "-D_MDd")
         list(APPEND result -Xclang;--dependent-lib=msvcrtd)
+      else()
+        list(APPEND result "-D_MD")
+        list(APPEND result -Xclang;--dependent-lib=msvcrt)
       endif()
     endif()
 

cmake/modules/SwiftConfigureSDK.cmake

@@ -14,10 +14,10 @@ function(_report_sdk prefix)
     message(STATUS "  UCRT Version: $ENV{UCRTVersion}")
     message(STATUS "  UCRT SDK Dir: $ENV{UniversalCRTSdkDir}")
     message(STATUS "  VC Dir: $ENV{VCToolsInstallDir}")
-    if("${CMAKE_BUILD_TYPE}" STREQUAL "RELEASE")
-      message(STATUS "  ${CMAKE_BUILD_TYPE} VC++ CRT: MD")
-    else()
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "DEBUG")
       message(STATUS "  ${CMAKE_BUILD_TYPE} VC++ CRT: MDd")
+    else()
+      message(STATUS "  ${CMAKE_BUILD_TYPE} VC++ CRT: MD")
     endif()
 
     foreach(arch ${SWIFT_SDK_${prefix}_ARCHITECTURES})