COMP: Fix OpenSSL build on macOS setting SDKROOT in build script #4883
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit fixes a regression introduced in ddeb0a3 (COMP: Fix OpenSSL build on Mac 10.15 XCode 11.4.1 (Slicer#4857)) originally intended to fix issue Slicer#4681 Setting the SDKROOT environment variable worked as expected on a regular developer build but failed on a dashboard build where the invocation of "make" is wrapped using a "launcher" [1] This commit addresses the issue by writing a CMake script that will set the environment and then invoke make. Last, since file descriptors expect by the make jobserver are not kept open by the CMake process, the build script explicitly unset MAKEFLAGS to avoid "warning: -jN forced in submake: disabling jobserver mode." For more details, see [2] [1] https://cmake.org/cmake/help/latest/manual/ctest.1.html#ctest-build-step [2] https://stackoverflow.com/questions/29910944/is-it-possible-to-pass-through-gnu-make-jobserver-environment-to-a-submake-ser
|
Merging, change tested on Linux and macOS Cc: @sjh26 @pieper @hjmjohnson |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit fixes a regression introduced in ddeb0a3 (COMP: Fix
OpenSSL build on Mac 10.15 XCode 11.4.1 (#4857)) originally intended
to fix issue #4681
Setting the SDKROOT environment variable worked as expected on a regular
developer build but failed on a dashboard build where the invocation of
"make" is wrapped using a "launcher" [1]
This commit addresses the issue by writing a CMake script that will set
the environment and then invoke make.
Last, since file descriptors expect by the make jobserver are not kept
open by the CMake process, the build script explicitly unset MAKEFLAGS
to avoid "warning: -jN forced in submake: disabling jobserver mode."
For more details, see [2]
[1] https://cmake.org/cmake/help/latest/manual/ctest.1.html#ctest-build-step
[2] https://stackoverflow.com/questions/29910944/is-it-possible-to-pass-through-gnu-make-jobserver-environment-to-a-submake-ser