Skip to content

Commit

Permalink
Specify path to ninja for Linux bootstrap builds
Browse files Browse the repository at this point in the history
If a contributor doesn't have ninja-build installed, they can
run into build failures because we don't pass the path of the
built ninja to CMake.
  • Loading branch information
bitjammer committed Nov 17, 2015
1 parent d9bbb6c commit 7b93555
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions utils/build-script-impl
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,12 @@ function set_deployment_target_based_options() {
case $deployment_target in
linux-x86_64)
SWIFT_HOST_VARIANT_ARCH="x86_64"
if [[ "$BUILD_NINJA" ]]; then
llvm_cmake_options=(-DCMAKE_MAKE_PROGRAM="$(build_directory build ninja)/ninja")
swift_cmake_options=(-DCMAKE_MAKE_PROGRAM="$(build_directory build ninja)/ninja")
cmark_cmake_options=(-DCMAKE_MAKE_PROGRAM="$(build_directory build ninja)/ninja")
swiftpm_cmake_options=(-DCMAKE_MAKE_PROGRAM="$(build_directory build ninja)/ninja")
fi
;;
macosx-* | iphoneos-* | iphonesimulator-* | \
appletvos-* | appletvsimulator-* | \
Expand Down

0 comments on commit 7b93555

Please sign in to comment.