[build] Fix bootstrapping builds that disable back-deployment #73619
Conversation
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
|
@swift-ci please test |
edymtt
approved these changes
May 17, 2024
cmake/modules/AddSwift.cmake
Outdated
| # only if needed | ||
| target_link_directories(${target} PRIVATE "${compatibility_libs_path}") | ||
| add_dependencies(${target} ${compatibility_libs}) | ||
| if(NOT "${compatibility_libs_path}" STREQUAL "") |
There was a problem hiding this comment.
Nit: there is a more idiomatic way to express this
Suggested change
| if(NOT "${compatibility_libs_path}" STREQUAL "") | |
| if(compatibility_libs_path) |
There was a problem hiding this comment.
If you have cycles, could you surrounds the lines for the BOOTSTRAPPING case (lines 544-545 after the changes) with this very check?
There was a problem hiding this comment.
Sure, fixed this, thanks!
This fixes a build that passes `-D SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT=NO` and `-D BOOTSTRAPPING_MODE=BOOTSTRAPPING-WITH-HOSTLIBS`. Previously a few CMake errors would be emitted: ``` CMake Error at cmake/modules/AddSwift.cmake:478 (get_property): get_property could not find TARGET HostCompatibilityLibs. Perhaps it has not yet been created. CMake Error at cmake/modules/AddSwift.cmake:527 (add_dependencies): add_dependencies called with incorrect number of arguments Call Stack (most recent call first): cmake/modules/AddSwift.cmake:969 (_add_swift_runtime_link_flags) tools/driver/CMakeLists.txt:23 (add_swift_host_tool) ```
egorzhdan
force-pushed
the
egorzhdan/bootstrapping-without-backdeployment
branch
from
0edff62 to
421ee98
Compare
|
@swift-ci please test |
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 fixes a build that passes
-D SWIFT_STDLIB_SUPPORT_BACK_DEPLOYMENT=NOand-D BOOTSTRAPPING_MODE=BOOTSTRAPPING-WITH-HOSTLIBS.Previously a few CMake errors would be emitted: