Merge pull request #28058 from compnerd/id-is-not-name

compnerd · web-flow · commit ea950dfdc785 · 2019-11-04T13:26:50.000-08:00
build: check the compiler against the correct variable
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -1991,7 +1991,7 @@ function(add_swift_target_library name)
         DEPLOYMENT_VERSION_WATCHOS "${SWIFTLIB_DEPLOYMENT_VERSION_WATCHOS}"
         GYB_SOURCES ${SWIFTLIB_GYB_SOURCES}
       )
-    if(NOT SWIFT_BUILT_STANDALONE AND NOT CMAKE_C_COMPILER MATCHES Clang)
+    if(NOT SWIFT_BUILT_STANDALONE AND NOT "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
       add_dependencies(${VARIANT_NAME} clang)
     endif()
 

Original file line number	Diff line number	Diff line change
`@@ -1991,7 +1991,7 @@ function(add_swift_target_library name)`
`1991`	`1991`	`DEPLOYMENT_VERSION_WATCHOS "${SWIFTLIB_DEPLOYMENT_VERSION_WATCHOS}"`
`1992`	`1992`	`GYB_SOURCES ${SWIFTLIB_GYB_SOURCES}`
`1993`	`1993`	`)`
`1994`		`- if(NOT SWIFT_BUILT_STANDALONE AND NOT CMAKE_C_COMPILER MATCHES Clang)`
	`1994`	`+ if(NOT SWIFT_BUILT_STANDALONE AND NOT "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")`
`1995`	`1995`	`add_dependencies(${VARIANT_NAME} clang)`
`1996`	`1996`	`endif()`
`1997`	`1997`