Merge pull request swiftlang#31023 from apple/also-swift-needs-that

dcci · web-flow · commit 6e6761e4c425 · 2020-04-15T12:00:59.000-07:00
[build-script] Pass CMAKE_OSX_SYSROOT to swift_cmake_options too.
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -620,6 +620,7 @@ function set_build_options_for_host() {
                 -DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS="${DARWIN_DEPLOYMENT_VERSION_IOS}"
                 -DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS="${DARWIN_DEPLOYMENT_VERSION_TVOS}"
                 -DSWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS="${DARWIN_DEPLOYMENT_VERSION_WATCHOS}"
+                -DCMAKE_OSX_SYSROOT:PATH="${cmake_os_sysroot}"
             )
             ;;
     esac

Original file line number	Diff line number	Diff line change
`@@ -620,6 +620,7 @@ function set_build_options_for_host() {`
`620`	`620`	`-DSWIFT_DARWIN_DEPLOYMENT_VERSION_IOS="${DARWIN_DEPLOYMENT_VERSION_IOS}"`
`621`	`621`	`-DSWIFT_DARWIN_DEPLOYMENT_VERSION_TVOS="${DARWIN_DEPLOYMENT_VERSION_TVOS}"`
`622`	`622`	`-DSWIFT_DARWIN_DEPLOYMENT_VERSION_WATCHOS="${DARWIN_DEPLOYMENT_VERSION_WATCHOS}"`
	`623`	`+ -DCMAKE_OSX_SYSROOT:PATH="${cmake_os_sysroot}"`
`623`	`624`	`)`
`624`	`625`	`;;`
`625`	`626`	`esac`