Merge pull request #20023 from Rostepher/cherry-pick-pr-19834-to-5.0

shahmishal · web-flow · commit c052770dbddd · 2018-10-25T11:03:50.000-07:00
[Build System: build-script-impl] Cherry-pick #19834 to the 5.0 branch
diff --git a/utils/build-script-impl b/utils/build-script-impl
@@ -2628,7 +2628,7 @@ for host in "${ALL_HOSTS[@]}"; do
                     -DCMAKE_INSTALL_LIBDIR:PATH="lib"
 
                     -DENABLE_SWIFT=YES
-                    -DSWIFT_RUNTIME_LIBDIR:PATH="${SWIFT_BUILD_PATH}/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}"
+                    -DSwift_DIR="${SWIFT_BUILD_PATH}/lib/cmake/swift"
 
                     -DENABLE_TESTING=YES
                   )

Original file line number	Diff line number	Diff line change
`@@ -2628,7 +2628,7 @@ for host in "${ALL_HOSTS[@]}"; do`
`2628`	`2628`	`-DCMAKE_INSTALL_LIBDIR:PATH="lib"`
`2629`	`2629`
`2630`	`2630`	`-DENABLE_SWIFT=YES`
`2631`		`- -DSWIFT_RUNTIME_LIBDIR:PATH="${SWIFT_BUILD_PATH}/lib/swift/${SWIFT_HOST_VARIANT}/${SWIFT_HOST_VARIANT_ARCH}"`
	`2631`	`+ -DSwift_DIR="${SWIFT_BUILD_PATH}/lib/cmake/swift"`
`2632`	`2632`
`2633`	`2633`	`-DENABLE_TESTING=YES`
`2634`	`2634`	`)`