Skip to content

build: shuffle add_swift_target_library (NFC) #29807

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Feb 27, 2020
Merged

build: shuffle add_swift_target_library (NFC) #29807

merged 1 commit into from
Feb 27, 2020

Conversation

compnerd
Copy link
Member

This moves the add_swift_target_library into the stdlib level cmake
module directory. This is used strictly for building the standard
library bits.

Replace this paragraph with a description of your changes and rationale. Provide links to external references/discussions if appropriate.

Resolves SR-NNNN.

@compnerd
Copy link
Member Author

@swift-ci please smoke test

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

CC: @xiaobai @gottesmm @drexin

@gottesmm
Copy link
Contributor

Does this handle the swiftSwiftLang library? I am pretty sure that still uses this. That being said when I last hit this, I spoke with @harlanhaskins and he said that we can move that into a swiftpm based package build.

Then this is good to go.

@compnerd
Copy link
Member Author

Interesting, Im definitely in favour of moving swiftSwiftLang into a swiftpm package. That said, that will continue to work after this change, its just a code movement to shuffle the target specific logic into the target subdirectory.

@compnerd
Copy link
Member Author

That concern has been alleviated. For the time being swift-lang has been shuffled into stdlib/tools. @nathawes will be look into moving that into swift-stress-tester as a follow up.

@compnerd
Copy link
Member Author

@swift-ci please clean test

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 671eb810f363ab98ab3bb668f461dae34b90ffd2

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 671eb810f363ab98ab3bb668f461dae34b90ffd2

@compnerd
Copy link
Member Author

@swift-ci please test Linux platform

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

@swift-ci please test macOS platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 711e84a4b7fbdcbfc440f0f1f4f20ac17da87a8b

@compnerd
Copy link
Member Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 711e84a4b7fbdcbfc440f0f1f4f20ac17da87a8b

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 711e84a4b7fbdcbfc440f0f1f4f20ac17da87a8b

@compnerd
Copy link
Member Author

@swift-ci please clean test

@compnerd
build: shuffle around some functions
fc67fc7 
This is a purely code motion change.  It moves the functions that are
specific to `SwiftSource.cmake` into `SwiftSource.cmake`.  Target
functions are moved to `stdlib/cmake/modules/AddSwiftStdlib.cmake`.
@compnerd
Copy link
Member Author

@swift-ci please clean test

@compnerd compnerd mentioned this pull request Feb 26, 2020
Merged
drexin
drexin approved these changes Feb 26, 2020
View reviewed changes
Copy link
Contributor

@drexin drexin left a comment

Choose a reason for hiding this comment

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

LGTM

@compnerd compnerd merged commit 10803c0 into swiftlang:master Feb 27, 2020
@compnerd compnerd deleted the gottesman-style branch February 27, 2020 04:33
@drodriguez drodriguez mentioned this pull request Feb 27, 2020
Merged
@lanza
Copy link
Contributor

lanza commented Feb 27, 2020

@compnerd This breaks the change you did from two weeks ago: 379137f6f1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drexin drexin drexin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@compnerd @gottesmm @swift-ci @lanza @drexin