Skip to content

[Build System: CMake] Correctly set the Darwin deployment targets when building the overlay projects #22133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2019

Conversation

Rostepher
Copy link
Contributor

rdar://47558666

…aders to the source dir when building the standalone overlays (rdar://47558666).
@Rostepher Rostepher requested a review from najacque January 25, 2019 23:29
@Rostepher
Copy link
Contributor Author

@swift-ci please smoke test

@@ -61,7 +61,7 @@ precondition(TOOLCHAIN_DIR)

# Some overlays include the runtime's headers,
# and some of those headers are generated at build time.
add_subdirectory("${SWIFT_SOURCE_DIR}/include" "swift/include")
add_subdirectory("${SWIFT_SOURCE_DIR}/include" "${SWIFT_SOURCE_DIR}/include")
add_subdirectory("${SWIFT_SOURCE_DIR}/apinotes" "swift/apinotes")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't you also make the same change for the APINotes?

@Rostepher Rostepher merged commit 1a71794 into swiftlang:master Jan 26, 2019
@Rostepher Rostepher deleted the fix-overlay-builds branch January 26, 2019 00:51
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.

2 participants