Skip to content

Clean up _add_swift_host_library_single #29853

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 33 commits into from
Feb 17, 2020
Merged

Clean up _add_swift_host_library_single #29853

merged 33 commits into from
Feb 17, 2020

Conversation

compnerd
Copy link
Member

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

CC: @xiaobai @gottesmm @drexin

@compnerd
Copy link
Member Author

@karwa hopefully this explains somewhat the reason for the split - this allows us to nearly remove all the options

@compnerd
Copy link
Member Author

@swift-ci please clean test

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

drexin
drexin reviewed Feb 14, 2020
View reviewed changes
cmake/modules/AddSwift.cmake
# [C_COMPILE_FLAGS flag1...]
# [SWIFT_COMPILE_FLAGS flag1...]
# [LINK_FLAGS flag1...]
# [FILE_DEPENDS target1 ...]
Copy link
Contributor

Choose a reason for hiding this comment

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

add_swift_host_library still defines FILE_DEPENDS as one of the parameters, but doesn't use it anywhere, so I'm wondering if it should be removed there as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmm, perhaps I missed it? It should be removed in the final view of things. The individual steps are meant to be easier to digest.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hmm, it hasn't supported that for a while, it did however document it as supporting it before this set of changes. Fake news! :-p

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - f1c078833ae80d72d285d87882705f29d76da412

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - f1c078833ae80d72d285d87882705f29d76da412

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

@swift-ci please clean test Windows platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - f1c078833ae80d72d285d87882705f29d76da412

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - f1c078833ae80d72d285d87882705f29d76da412

@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 - 39cd9df58e75ac74f32721e9f2ed654b7a4d6862

@compnerd
Copy link
Member Author

@swift-ci please clean test macOS platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 39cd9df58e75ac74f32721e9f2ed654b7a4d6862

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 39cd9df58e75ac74f32721e9f2ed654b7a4d6862

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - cf9c24f49b91672061eda7fb658dbb190ea408b1

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - f1f01b10c590fe0e5b6981da4158b0f195fb4f77

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - f1f01b10c590fe0e5b6981da4158b0f195fb4f77

@compnerd
Copy link
Member Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - f1f01b10c590fe0e5b6981da4158b0f195fb4f77

@compnerd
Copy link
Member Author

@swift-ci please clean test macOS platform

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - f1f01b10c590fe0e5b6981da4158b0f195fb4f77

@compnerd
build: remove MODULE path from _add_swift_host_library_single
9f637d4
@compnerd
build: remove MODULE_TARGETS from _add_swift_host_library_single
d329864
@compnerd
build: remove C_COMPILE_FLAGS from _add_swift_host_library_single
abb9d7d
@compnerd
build: remove LINK_LIBRARIES from _add_swift_host_library_single
5d1c760
@compnerd
build: remove PRIVATE_LINK_LIBRARIES from `_add_swift_host_library_…
fd74b30 
…single`
@compnerd
build: remove DEPENDS from _add_swift_host_library_single
7bc703e
@compnerd
build: remove FRAMEWORK_DEPENDS from _add_swift_host_library_single
e4064fd
@compnerd
build: remove FRAMEWORK_WEAK_DEPENDS from `_add_swift_host_library_…
d1d7009 
…single`
@compnerd
build: remove LINK_FLAGS from _add_swift_host_library_single
36193c3
@compnerd
build: remove INCORPORATE_OBJECT_LIBRARIES from `_add_swift_host_li…
b70b2b1 
…brary_single`
@compnerd
build: remove INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY from `_add_s…
7f4b406 
…wift_host_library_single`
@compnerd
build: remove FILE_DEPENDS from _add_swift_host_library_single
626a1f4
@compnerd
build: remove SWIFT_COMPILE_FLAGS from `_add_swift_host_library_sin…
546b9b6 
…gle`
@compnerd
build: remove DEPLOYMENT_VERSION_* from `_add_swift_host_library_si…
7235462 
…ngle`
@compnerd
build: remove DARWIN_INSTALL_NAME_DIR from `_add_swift_host_library…
3c9bb5a 
…_single`
@compnerd
build: remove Swift support for _add_swift_host_library_single
4f516da 
The host libraries do not build Swift code, these libraries are C++
libraries used for the compiler.
@compnerd
build: cleanup unreferenced variable `SWIFTLIB_SINGLE_EXTERNAL_SOURCE…
a8d9ab1 
…S` in `_add_swift_host_library_single`
@compnerd
build: simplify INSTALL_NAME_DIR computation in `_add_swift_host_li…
bd60845 
…brary_single`
@compnerd
build: remove some un-valuved variables in `_add_swift_host_library_s…
cefb90d 
…ingle`
@compnerd
build: remove unreferenced variable in _add_swift_host_library_single
dbd4ea0
@compnerd
build: remove ICU references in _add_swift_host_library_single
d01312c
@compnerd
build: remove swiftCore workaround in _add_swift_host_library
8430a03
@compnerd
build: inline some variables in _add_swift_host_library_single
697a44c
@compnerd
build: use _add_swift_target_library_single
379137f 
This library is meant to run on the platform where the testing occurs,
requiring bits to run.  This makes this library a target library.
@compnerd
Copy link
Member Author

@swift-ci please clean test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - f1f01b10c590fe0e5b6981da4158b0f195fb4f77

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd compnerd merged commit 3777ec0 into swiftlang:master Feb 17, 2020
@compnerd compnerd deleted the cleaning-up branch February 17, 2020 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drexin drexin drexin left review comments

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

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