build: Fix various MacOS problems with GitHub and CMake#1982
Merged
lgritz merged 1 commit intoAcademySoftwareFoundation:mainfrom Apr 22, 2025
Merged
build: Fix various MacOS problems with GitHub and CMake#1982lgritz merged 1 commit intoAcademySoftwareFoundation:mainfrom
lgritz merged 1 commit intoAcademySoftwareFoundation:mainfrom
Conversation
The combination of cmake 4.0, changing homebrew default package versions, and slight changes rolled out to the GitHub Actions runner images conspired to break our CI for 2 of 3 Mac variants. Fixes: * Apple: only add the -isysroot to the bitcode-generating clang++ command if CMAKE_OSX_SYSROOT is defined. Plot twist -- this is no longer set by cmake starting with cmake 4.0! * Fix incorrect warning message for apple clang vs newish llvm in externalpackages.cmake. * Remove homebrew unlinking of python@3.10 that warned in install_homebrew_deps.bash. On the GHA runners, it was giving us warnings because we were asking this package to be unlinked but it wasn't installed. For future needs, add an env variable based way to unlink individual packges. Signed-off-by: Larry Gritz <lg@larrygritz.com>
Collaborator
Author
|
I'll hold this until the end of the day because we try to avoid ever merging without a suitable time for meaningful review, but because it fixes broken CI, I will merge it at that point even if still not reviewed. |
Collaborator
Author
|
3 days + needed to fix broken CI --> merging |
lgritz
added a commit
to lgritz/OpenShadingLanguage
that referenced
this pull request
Apr 22, 2025
…areFoundation#1982) The combination of cmake 4.0, changing homebrew default package versions, and slight changes rolled out to the GitHub Actions runner images conspired to break our CI for 2 of 3 Mac variants. Fixes: * Apple: only add the -isysroot to the bitcode-generating clang++ command if CMAKE_OSX_SYSROOT is defined. Plot twist -- this is no longer set by cmake starting with cmake 4.0! * Fix incorrect warning message for apple clang vs newish llvm in externalpackages.cmake. * Remove homebrew unlinking of python@3.10 that warned in install_homebrew_deps.bash. On the GHA runners, it was giving us warnings because we were asking this package to be unlinked but it wasn't installed. For future needs, add an env variable based way to unlink individual packges. Signed-off-by: Larry Gritz <lg@larrygritz.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
The combination of cmake 4.0, changing homebrew default package versions, and slight changes rolled out to the GitHub Actions runner images conspired to break our CI for 2 of 3 Mac variants. Fixes:
Apple: only add the -isysroot to the bitcode-generating clang++ command if CMAKE_OSX_SYSROOT is defined. Plot twist -- this is no longer set by cmake starting with cmake 4.0!
Fix incorrect warning message for apple clang vs newish llvm in externalpackages.cmake.
Remove homebrew unlinking of python@3.10 that warned in install_homebrew_deps.bash. On the GHA runners, it was giving us warnings because we were asking this package to be unlinked but it wasn't installed. For future needs, add an env variable based way to unlink individual packges.