Skip to content

Remove SWIFTLIB_SINGLE_TARGET_LIBRARY #38978

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 2 commits into from
Aug 24, 2021
Merged

Remove SWIFTLIB_SINGLE_TARGET_LIBRARY #38978

merged 2 commits into from
Aug 24, 2021

Conversation

kubamracek
Copy link
Contributor

No description provided.

@kubamracek kubamracek mentioned this pull request Aug 20, 2021
Merged
@kubamracek
Copy link
Contributor Author

@swift-ci please test

@compnerd
Copy link
Member

@swift-ci please test windows platform

compnerd
compnerd approved these changes Aug 21, 2021
View reviewed changes
Copy link
Member

@compnerd compnerd left a comment

Choose a reason for hiding this comment

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

Thanks for the clean up! This looks right to me - they are always "target" libraries in this sub-project.

@kubamracek kubamracek force-pushed the remove-swiftlib-single-target-library branch from 11122e1 to 222cc51 Compare August 21, 2021 21:33
@kubamracek
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 222cc51

@kubamracek
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 222cc51

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 222cc51

@kubamracek
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 222cc51

@kubamracek
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 222cc51

@kubamracek
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 222cc51

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - 222cc51

@kubamracek
Copy link
Contributor Author

@swift-ci please test

@kubamracek
Copy link
Contributor Author

@compnerd, the Windows bot says:

LINK: command "C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1429~1.300\bin\Hostx64\x64\link.exe /nologo lib\swift\windows\x86_64\swiftrt.obj stdlib\private\BlocksRuntimeStubs\CMakeFiles\BlocksRuntimeStub-windows-x86_64.dir\BlocksRuntime.c.obj /out:test-windows-x86_64\BlocksRuntime.dll /implib:test-windows-x86_64\BlocksRuntime.lib /pdb:test-windows-x86_64\BlocksRuntime.pdb /dll /version:0.0 /INCREMENTAL:NO /INCREMENTAL:NO -LIBPATH:T:\llvm\.\lib -LIBPATH:T:\swift\.\lib\swift\windows\x86_64 -LIBPATH:T:\swift\.\bin\..\lib\swift\windows\x86_64 -LIBPATH:T:\swift\.\bin\..\lib\swift\windows -LIBPATH:\usr\lib\swift -LIBPATH:C:\PROGRA~2\MICROS~1\2019\COMMUN~1\VC\Tools\MSVC\1429~1.300\Lib\x64 -LIBPATH:C:\PROGRA~2\WI3CF2~1\10\Lib\100177~1.0\ucrt\x64 -LIBPATH:C:\PROGRA~2\WI3CF2~1\10\Lib\100177~1.0\um\x64 -LIBPATH:T:\swift\winsdk_lib_x86_64_symlinks -LIBPATH:C:\Users\swift-ci\jenkins\workspace\swift-PR-windows\icu-64_2\lib64 kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib /MANIFEST /MANIFESTFILE:test-windows-x86_64\BlocksRuntime.dll.manifest" failed (exit code 1120) with the following output:
   Creating library test-windows-x86_64\BlocksRuntime.lib and object test-windows-x86_64\BlocksRuntime.exp
swiftrt.obj : error LNK2019: unresolved external symbol __imp_swift_addNewDSOImage referenced in function "void __cdecl swift_image_constructor(void)" (?swift_image_constructor@@YAXXZ)
test-windows-x86_64\BlocksRuntime.dll : fatal error LNK1120: 1 unresolved externals

That sounds related to this change... Any ideas?

@compnerd
Copy link
Member

https://github.com/apple/swift/pull/38978/files?w=1#diff-e2e2a250882f66d531f2a42c201e013fa2d8be892b2880a32d6596710761f470L878-L895

You are now linking in the runtime object on Linux and Windows, this is an incorrect functional change.

@kubamracek
Copy link
Contributor Author

@compnerd Thanks!

@kubamracek
Copy link
Contributor Author

@swift-ci please test

@kubamracek kubamracek merged commit bcbe8e7 into main Aug 24, 2021
@kubamracek kubamracek deleted the remove-swiftlib-single-target-library branch August 24, 2021 14:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compnerd compnerd compnerd approved these changes

@gottesmm gottesmm Awaiting requested review from gottesmm

@edymtt edymtt Awaiting requested review from edymtt

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
@kubamracek @compnerd @swift-ci