Skip to content

Conversation

@etcwilde
Copy link
Member

@etcwilde etcwilde commented Jun 6, 2024

One may need to be able to set the make program on the macro build. Either they are unable to have Ninja on their path, or need to use a different Ninja for their macro build.
The behavior of this PR:

  • default it to the CMAKE_MAKE_PROGRAM, which, if unset, will pull the make program the path as CMake does normally.
  • If it is set but SwiftTesting_MACRO_MAKE_PROGRAM is unset, it will default to the specified CMAKE_MAKE_PROGRAM that is used for the rest of the build.
  • Finally, if one needs to use a different make program for the macro build from the rest (using a different cross-compiling toolchain, e.g), they can specify SwiftTesting_MACRO_MAKE_PROGRAM explicitly.

For reasons, one may need to be able to set the make program on the
macro build. Either they are unable to have `Ninja` on their path, or
need to use a different `Ninja` for their macro build.
@etcwilde
Copy link
Member Author

etcwilde commented Jun 6, 2024

CC: @compnerd, @jeffdav

@grynspan
Copy link
Contributor

grynspan commented Jun 6, 2024

@swift-ci please test

@grynspan grynspan merged commit 6b948b9 into swiftlang:main Jun 6, 2024
@etcwilde etcwilde deleted the ewilde/forward-make-program branch June 6, 2024 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants