Skip to content

Commit fab6738

Browse files
committed
Merge pull request swiftlang#937 from smikes/bootstrap-ninja-set-make-program
[build-script-impl][SR-58] When bootstrapping ninja, set CMAKE_MAKE_COMMAND
2 parents 206d410 + 3e4d6c7 commit fab6738

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

utils/build-script-impl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,11 @@ if [[ "${BUILD_NINJA}" ]] ; then
13271327
{ set +x; } 2>/dev/null
13281328
fi
13291329
fi
1330-
export PATH="${build_dir}:${PATH}"
1330+
NINJA_BIN="${build_dir}/ninja"
1331+
COMMON_CMAKE_OPTIONS=(
1332+
"${COMMON_CMAKE_OPTIONS[@]}"
1333+
-DCMAKE_MAKE_PROGRAM=${NINJA_BIN}
1334+
)
13311335
fi
13321336

13331337
#

0 commit comments

Comments
 (0)