Merge pull request #27979 from compnerd/dependencies

compnerd · web-flow · commit a259eb581889 · 2019-10-31T13:46:50.000-07:00
build: add a dependency on clang
diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake
@@ -1991,6 +1991,9 @@ 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)
+      add_dependencies(${VARIANT_NAME} clang)
+    endif()
 
       if(sdk STREQUAL WINDOWS)
         if(SWIFT_COMPILER_IS_MSVC_LIKE)

Original file line number	Diff line number	Diff line change
`@@ -1991,6 +1991,9 @@ 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)`
	`1995`	`+ add_dependencies(${VARIANT_NAME} clang)`
	`1996`	`+ endif()`
`1994`	`1997`
`1995`	`1998`	`if(sdk STREQUAL WINDOWS)`
`1996`	`1999`	`if(SWIFT_COMPILER_IS_MSVC_LIKE)`