Commit Graph

827 Commits

Author SHA1 Message Date
Saleem Abdulrasool
b40bd3ecba build: remove reference to handle_swift_sources in C++ path
The toolchain binaries are all C++ code.  This removes the last tie to
the custom Swift handling in CMake for the host functions.
2020-02-27 21:32:45 -08:00
Saleem Abdulrasool
fc67fc74fb build: shuffle around some functions
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`.
2020-02-26 12:47:43 -08:00
Saleem Abdulrasool
2e2e886832 build: bifurcate _add_swift_executable_single 2020-02-23 14:20:12 -08:00
Michael Gottesman
79716efbee Merge pull request #29960 from compnerd/add-swift-host-library-single-simplifications
`_add_swift_host_library_single` simplifications
2020-02-20 23:26:52 -08:00
Michael Ilseman
bfd0de4928 Revert "Revert "Revert "swift-lang: shuffle the source directory structure (N…" 2020-02-20 15:39:51 -08:00
Saleem Abdulrasool
4b2cbd64f4 build: rename prefix for _add_swift_host_library_single 2020-02-20 09:10:00 -08:00
Saleem Abdulrasool
a32b479250 build: custom import libraries are not needed for host libraries 2020-02-20 09:10:00 -08:00
Saleem Abdulrasool
4a93f70e1f build: use a regular expression in _add_swift_host_library_single 2020-02-20 09:10:00 -08:00
Saleem Abdulrasool
749dd266c3 build: inline constant values for _add_swift_host_library_single 2020-02-20 09:10:00 -08:00
Saleem Abdulrasool
f11ecdec9c build: remove unnecessary set_target_property
Now that `_add_swift_host_library_single` only deals with host
libraries, it is no longer mutating the name of the library target.
This `set_target_property` is no longer needed.
2020-02-20 09:10:00 -08:00
Saleem Abdulrasool
56e58b4764 build: remove duplicated parameter to _add_swift_host_library_single 2020-02-20 09:09:59 -08:00
Saleem Abdulrasool
200b96df81 Revert "Revert "swift-lang: shuffle the source directory structure (NFC)""
This reverts commit beb8ecd8cc.  Add a
workaround for the dependency issue.

It is unclear why `sourcekitd` is getting added improperly as a
dependency on `lib/sourcekitd.framework/sourcekitd`.  This workaround
adjusts the dependency such that we end up with a dependency on
`lib/sourcekitd.framework/Versions/A/sourcekitd` as an order-only
dependency.  This should fix the compile issue.  I am unable to
reproduce this issue with the `add_library` usage for adding a Swift
library.  This allows us to cleave the host and target libraries, and so
the workaround is sufficient to make progress and the problem will be
resolved with the migration towards CMake for handling the dependencies.
2020-02-19 16:09:37 -08:00
Saleem Abdulrasool
697a44cf81 build: inline some variables in _add_swift_host_library_single 2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
8430a0388f build: remove swiftCore workaround in _add_swift_host_library 2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
d01312cc3e build: remove ICU references in _add_swift_host_library_single 2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
dbd4ea05d7 build: remove unreferenced variable in _add_swift_host_library_single 2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
cefb90d485 build: remove some un-valuved variables in _add_swift_host_library_single 2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
bd60845eda build: simplify INSTALL_NAME_DIR computation in _add_swift_host_library_single 2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
a8d9ab1537 build: cleanup unreferenced variable SWIFTLIB_SINGLE_EXTERNAL_SOURCES in _add_swift_host_library_single 2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
4f516dad9a build: remove Swift support for _add_swift_host_library_single
The host libraries do not build Swift code, these libraries are C++
libraries used for the compiler.
2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
3c9bb5a1df build: remove DARWIN_INSTALL_NAME_DIR from _add_swift_host_library_single 2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
7235462e0a build: remove DEPLOYMENT_VERSION_* from _add_swift_host_library_single 2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
546b9b6f8c build: remove SWIFT_COMPILE_FLAGS from _add_swift_host_library_single 2020-02-16 13:53:38 -08:00
Saleem Abdulrasool
626a1f418a build: remove FILE_DEPENDS from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
7f4b40678c build: remove INCORPORATE_OBJECT_LIBRARIES_SHARED_ONLY from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
b70b2b1dd0 build: remove INCORPORATE_OBJECT_LIBRARIES from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
36193c363b build: remove LINK_FLAGS from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
d1d70092ce build: remove FRAMEWORK_WEAK_DEPENDS from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
e4064fd0c4 build: remove FRAMEWORK_DEPENDS from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
7bc703e43a build: remove DEPENDS from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
fd74b30359 build: remove PRIVATE_LINK_LIBRARIES from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
5d1c760486 build: remove LINK_LIBRARIES from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
abb9d7db90 build: remove C_COMPILE_FLAGS from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
d3298646db build: remove MODULE_TARGETS from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
9f637d4e1e build: remove MODULE path from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
f3d9f87417 build: remove OBJECT_LIBRARY from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
39d6e98b9b build: remove DONT_EMBED_BITCODE from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
9c3ec0eae4 build: remove NOSWIFTRT from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
e7889f178a build: remove TARGET_LIBRARY from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
1503cde071 build: remove IS_STDLIB from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
fe1cd23cb3 build: remove IS_STDLIB_CORE from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
2a10a9f938 build: remove IS_SDK_OVERLAY from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
c28e3fab94 build: remove DEPLOYMENT_VERSION_MACCATALYST from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
b6ac8ec7c4 build: remove MACCATALYST_BUILD_FLAVOR from _add_swift_host_library_single 2020-02-16 13:53:37 -08:00
Saleem Abdulrasool
42b3017224 build: duplicate _add_swift_library_single
This duplicates and renames the function `_add_swift_library_single`
into `_add_swift_host_library_single` and
`_add_swift_target_library_single`.  This will allow for splitting up of
the two paths from the functions.
2020-02-14 08:25:17 -08:00
Saleem Abdulrasool
66627d8037 build: obsolete options which have long been deprecated
This is simply dropping the error that would be presented for any
existing usage.  These have been rooted out for some time now.  Remove
the obsoleted checks.
2020-02-13 14:19:12 -08:00
Saleem Abdulrasool
b46ddbe982 build: make building with VS2017 15.8+ work again
This causes an ABI break on VS2017, but it is acceptable as there is no
guaranteed stability.
2020-02-12 11:15:56 -08:00
Saleem Abdulrasool
97df90fbf1 Merge pull request #29581 from drexin/wip-fix-atomics
Remove dependency on libatomic on Linux
2020-02-11 20:03:10 -08:00
Eric Miotto
8a76358b88 [build] avoid use generator expression to add linker parameter (#29636)
* [build] use generator expression only on CMake > 3.15

In CMake < 3.16, Generator expressions seem not to allow the `LINKER:` prefix to be
expanded correctly when used in `target_link_options`.

To account for this, account for two code paths according to CMake version -- use the generator expression when detecting we are on 3.16 and resort to an if statement otherwise

Addresses rdar://problem/59117166
2020-02-05 07:26:58 -08:00
Dario Rexin
62a5ebb6a2 Update AddSwift.cmake 2020-02-03 13:45:47 -08:00