[Build System: CMake] make add_swift_library a wrapper to add_llvm_library #19514

compnerd · 2018-09-24T22:38:35Z

…brary`

Split up the add_swift_library by extracting the tools host handling aspect of
it. This has a much more limited option set. Reducing the options further
would allow us to eliminate this and replace it with a wrapper around
add_llvm_library. Leave the bulk of the logic in place in
add_swift_target_library which can now be simplified on its own.

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

Resolves SR-NNNN.

compnerd · 2018-09-24T22:38:56Z

CC: @Rostepher @gottesmm

Let's get the party started!

compnerd · 2018-09-26T04:54:19Z

@gottesmm @llvm-beanz @Rostepher ... okay, this is about as thin of a wrapper over add_llvm_library as I can make due to the new use of gyb in the compiler itself. Not sure if this is worth it or not, but the first commit definitely is IMO.

Rostepher · 2018-09-26T06:46:25Z

Awesome work so far! I'll give this a closer look in the morning.

compnerd · 2018-09-26T15:52:40Z

@swift-ci please test

swift-ci · 2018-09-26T15:54:39Z

Build failed
Swift Test Linux Platform
Git Sha - 367c6abafa77458ceeae6c04bec900d5e7d527a4

swift-ci · 2018-09-26T15:56:22Z

Build failed
Swift Test OS X Platform
Git Sha - 367c6abafa77458ceeae6c04bec900d5e7d527a4

lib/Syntax/CMakeLists.txt

compnerd · 2018-09-26T18:59:54Z

@swift-ci please test linux platform

swift-ci · 2018-09-26T19:54:06Z

Build failed
Swift Test Linux Platform
Git Sha - 4179f1572e79e3f38b99ae3ccd02005310f2bff9

cmake/modules/AddSwift.cmake

lib/AST/CMakeLists.txt

compnerd · 2018-10-01T17:30:52Z

@swift-ci please test

swift-ci · 2018-10-01T17:31:20Z

Build failed
Swift Test OS X Platform
Git Sha - 4179f1572e79e3f38b99ae3ccd02005310f2bff9

swift-ci · 2018-10-01T17:35:19Z

Build failed
Swift Test Linux Platform
Git Sha - 4179f1572e79e3f38b99ae3ccd02005310f2bff9

compnerd · 2018-10-01T21:37:04Z

@swift-ci please test Linux platform

swift-ci · 2018-10-01T22:13:20Z

Build failed
Swift Test Linux Platform
Git Sha - 8aed746309542f806cfcaf65392eb9d91e7a14c5

compnerd · 2018-10-04T23:50:44Z

@swift-ci please test Linux platform

swift-ci · 2018-10-05T00:36:02Z

Build failed
Swift Test Linux Platform
Git Sha - 8aed746309542f806cfcaf65392eb9d91e7a14c5

compnerd · 2018-10-05T16:31:56Z

19:36:01 failed to demangle witness for associated type 'Iterator' in conformance 'Swift.Array<Commands.ToolName.Type>: Sequence' from mangled name 's16IndexingIteratorVySayxGG'

The failure seems to be a demangling issue? Not sure I understand how this is breaking (and only on Linux).

compnerd · 2018-10-05T16:33:24Z

CC: @eeckstein
Perhaps Erik has some idea?

eeckstein · 2018-10-05T17:08:53Z

Maybe there is some missing build dependency and something didn't get rebuilt.
You can try with a clean build

compnerd · 2018-10-28T22:41:20Z

@swift-ci please test

swift-ci · 2018-10-28T22:43:23Z

Build failed
Swift Test Linux Platform
Git Sha - 2128fcb25278d8fbb7050ec179d1d1d1054bad74

swift-ci · 2018-10-29T02:40:46Z

Build failed
Swift Test OS X Platform
Git Sha - 8aed746309542f806cfcaf65392eb9d91e7a14c5

compnerd · 2018-10-29T05:24:57Z

Bleh, it isn't the LINK_COMPONENTS. Ignore the topmost commit, I'm going to drop that. I still need to figure out how to make this work with the unified library only builds.

compnerd · 2018-10-29T05:45:38Z

@swift-ci please test

swift-ci · 2018-10-29T05:47:37Z

Build failed
Swift Test OS X Platform
Git Sha - 9cc15cf4696495ea838a6cee7db78a6e63c5a84f

swift-ci · 2018-10-29T05:47:37Z

Build failed
Swift Test Linux Platform
Git Sha - 9cc15cf4696495ea838a6cee7db78a6e63c5a84f

compnerd · 2018-10-29T16:54:06Z

The failure was due to a rebase failure on my part, sorry.

compnerd · 2018-10-29T16:54:12Z

@swift-ci please test

swift-ci · 2018-10-29T16:54:41Z

Build failed
Swift Test OS X Platform
Git Sha - 0fdce4c358ad4b3eaa9a3db3c0e4ed9538075f38

swift-ci · 2018-10-29T16:55:59Z

Build failed
Swift Test Linux Platform
Git Sha - 0fdce4c358ad4b3eaa9a3db3c0e4ed9538075f38

compnerd · 2018-10-29T20:59:52Z

@swift-ci please test macOS platform

compnerd · 2018-10-31T19:47:23Z

@swift-ci please test

swift-ci · 2018-10-31T19:49:14Z

Build failed
Swift Test Linux Platform
Git Sha - 2eb47049c1eb2b9f37927d8d2b0b575b953c7d74

swift-ci · 2018-10-31T19:51:29Z

Build failed
Swift Test OS X Platform
Git Sha - 2eb47049c1eb2b9f37927d8d2b0b575b953c7d74

compnerd · 2018-11-01T16:55:12Z

@swift-ci please test Linux platform

compnerd force-pushed the breakup branch 5 times, most recently from 9221a8a to 43c1598 Compare September 26, 2018 04:29

jrose-apple reviewed Sep 26, 2018

View reviewed changes

lib/Syntax/CMakeLists.txt Outdated Show resolved Hide resolved

Rostepher reviewed Sep 26, 2018

View reviewed changes

cmake/modules/AddSwift.cmake Outdated Show resolved Hide resolved

Rostepher reviewed Sep 26, 2018

View reviewed changes

cmake/modules/AddSwift.cmake Outdated Show resolved Hide resolved

Rostepher reviewed Sep 26, 2018

View reviewed changes

cmake/modules/AddSwift.cmake Outdated Show resolved Hide resolved

Rostepher reviewed Sep 26, 2018

View reviewed changes

lib/AST/CMakeLists.txt Show resolved Hide resolved

Rostepher changed the title ~~build: extract add_swift_library and rename to `add_swift_target_li…~~ [Build System: CMake] extract add_swift_library and rename to `add_swift_target_li… Sep 27, 2018

compnerd force-pushed the breakup branch from 4179f15 to 8aed746 Compare October 1, 2018 17:30

compnerd force-pushed the breakup branch from 9cc15cf to 0fdce4c Compare October 29, 2018 05:45

compnerd force-pushed the breakup branch from 0fdce4c to 2eb4704 Compare October 29, 2018 16:53

compnerd added 8 commits October 31, 2018 12:46

add_swift_host_library: remove FILE_DEPENDS

738a00a

add_swift_host_library: remove C_COMPILE_FLAGS

e0b8393

add_swift_host_library: rename LINK_LIBRARIES to LINK_LIBS

39dde93

add_swift_host_library: rename LLVM_COMPONENT_DEPENDS to LINK_COMPONENTS

c5c64ca

add_swift_host_library: remove LINK_INTERFACE_LIBRARIES

ce32a87

add_swift_host_library: remove LINK_FLAGS

1bb88b7

add_swift_host_library: make a trivial wrapper around add_llvm_library

e92c2a2

add_swift_host_library: special handling for GYB sources

c3555cf

compnerd force-pushed the breakup branch from 2eb4704 to c3555cf Compare October 31, 2018 19:47

compnerd changed the title ~~[Build System: CMake] extract add_swift_library and rename to `add_swift_target_li…~~ [Build System: CMake] make add_swift_library a wrapper to add_llvm_library Oct 31, 2018

compnerd merged commit 4277292 into swiftlang:master Nov 2, 2018

compnerd deleted the breakup branch November 2, 2018 16:56

[Build System: CMake] make add_swift_library a wrapper to add_llvm_library #19514

[Build System: CMake] make add_swift_library a wrapper to add_llvm_library #19514

Uh oh!

Conversation

compnerd commented Sep 24, 2018

Uh oh!

compnerd commented Sep 24, 2018

Uh oh!

compnerd commented Sep 26, 2018

Uh oh!

Rostepher commented Sep 26, 2018

Uh oh!

compnerd commented Sep 26, 2018

Uh oh!

swift-ci commented Sep 26, 2018

Uh oh!

swift-ci commented Sep 26, 2018

Uh oh!

Uh oh!

compnerd commented Sep 26, 2018

Uh oh!

swift-ci commented Sep 26, 2018

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

compnerd commented Oct 1, 2018

Uh oh!

swift-ci commented Oct 1, 2018

Uh oh!

swift-ci commented Oct 1, 2018

Uh oh!

compnerd commented Oct 1, 2018

Uh oh!

swift-ci commented Oct 1, 2018

Uh oh!

compnerd commented Oct 4, 2018

Uh oh!

swift-ci commented Oct 5, 2018

Uh oh!

compnerd commented Oct 5, 2018

Uh oh!

compnerd commented Oct 5, 2018

Uh oh!

eeckstein commented Oct 5, 2018

Uh oh!

compnerd commented Oct 28, 2018

Uh oh!

swift-ci commented Oct 28, 2018

Uh oh!

swift-ci commented Oct 29, 2018

Uh oh!

compnerd commented Oct 29, 2018

Uh oh!

compnerd commented Oct 29, 2018

Uh oh!

swift-ci commented Oct 29, 2018

Uh oh!

swift-ci commented Oct 29, 2018

Uh oh!

compnerd commented Oct 29, 2018

Uh oh!

compnerd commented Oct 29, 2018

Uh oh!

swift-ci commented Oct 29, 2018

Uh oh!

swift-ci commented Oct 29, 2018

Uh oh!

compnerd commented Oct 29, 2018

Uh oh!

compnerd commented Oct 31, 2018

Uh oh!

swift-ci commented Oct 31, 2018

Uh oh!

swift-ci commented Oct 31, 2018

Uh oh!

compnerd commented Nov 1, 2018

Uh oh!

Uh oh!