[Cmake] add toolchain and cache files for Darwin platforms #77958
Conversation
|
|
||
| if(NOT CMAKE_OSX_SYSROOT) | ||
| if(DEFINED ENV{SDKROOT}) | ||
| set(sdk_name $ENV{SDKROOT}) |
There was a problem hiding this comment.
Why is this sdk_name? The SDKROOT is the full path to the SDK right?
There was a problem hiding this comment.
not necessarily. macosx and iphoneos are valid values for the SDKROOT. The xcrun call below does the translation to the actual full path to the SDK.
| set(sdk_name $ENV{SDKROOT}) | ||
| else() | ||
| message(FATAL_ERROR "SDKROOT environment variable not set") | ||
| endif() |
There was a problem hiding this comment.
This might be easier to read as:
if(NOT DEFINED ENV{SDKROOT})
message(FATAL_ERROR "The 'SDKROOT' environment variable is not set")
endif()
execute_process(COMMAND "${XCRUN_EXECUTABLE}" --show-sdk-path -sdk $ENV{SDKROOT} ...)There was a problem hiding this comment.
cleaned up the check
| set(CMAKE_OSX_SYSROOT "${SDKROOT}" CACHE FILEPATH "") | ||
| endif() | ||
|
|
||
| if(NOT CMAKE_MAKE_PROGRAM) |
There was a problem hiding this comment.
What if ninja is already in the path? This would skip over that I think.
There was a problem hiding this comment.
In this case, that should be fine. The ninja that xcrun picks up here isn't special.
There was a problem hiding this comment.
Removed the check
There was a problem hiding this comment.
I agree with @compnerd's comment on cleaning up the SDKROOT environment variable check.
We can probably drop the CMAKE_MAKE_PROGRAM check from the toolchain. It's not really specific to a particular build in the same way that the compilers and linkers are. If it's not available on the PATH, we can plumb that in through the scripts invoking CMake.
|
@swift-ci please smoke test |
|
@swift-ci please smoke test Linux |
|
@swift-ci please test Windows |
|
@swift-ci please smoke test Linux |
1 similar comment
|
@swift-ci please smoke test Linux |
Add the Toolchain and cache files for the various Darwin platforms