Commit Graph

1328 Commits

Author SHA1 Message Date
Saleem Abdulrasool
64aebf47c5 build-script: use more terse checks
This uses the bash extension of regex based comparison rather than the
more portable shell approach which is a bit more terse.
2020-01-21 16:39:45 -08:00
swift-ci
e4c0a62479 Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-21 15:02:54 -08:00
Saleem Abdulrasool
1aafd55d16 build-script: add missing options, use more terse syntax
This makes the product computation more terse and adds the missing
options.  The functional aspects of this change include renaming the
`SKIP_BUILD_SWIFT_STATIC_LIBDISPATCH` to `SKIP_BUILD_STATIC_LIBDISPATCH`
which keeps it in line with the other skip options.  We also now list
the option properly.
2020-01-21 11:47:03 -08:00
swift-ci
4477037259 Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-21 08:42:51 -08:00
Saleem Abdulrasool
5a75996d1d Merge pull request #29320 from compnerd/android-is-simple
build-script: android does not do multi-arch builds
2020-01-21 08:25:37 -08:00
swift-ci
766f6cc3fe Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-21 08:23:24 -08:00
Saleem Abdulrasool
b11977a8b3 Merge pull request #29319 from compnerd/atomic-flag
build-script: handle special build rules for non-atomic runtime
2020-01-21 08:17:53 -08:00
swift-ci
5b380e8144 Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-20 18:23:21 -08:00
Saleem Abdulrasool
9e9d3fd84c build-script: android does not do multi-arch builds 2020-01-20 15:07:54 -08:00
Saleem Abdulrasool
b855260cae build-script: handle special build rules for non-atomic runtime
Move the special flag handling for the non-atomic runtime into the build
system rather than spreading it across the build system and the helper
utilities.
2020-01-20 14:51:27 -08:00
Saleem Abdulrasool
95102bc258 build-script: remove dead CMake options for Swift
The build system does not support fine grained control over the tools.
Ideally we would do this by hooking into the llvm distribution
mechanism.
2020-01-20 14:43:12 -08:00
swift-ci
d4f86d2e38 Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-17 17:03:39 -08:00
Ross Bayer
6a5c1662dd Merge pull request #29280 from compnerd/bs-options
build-script-impl: reorganise the option
2020-01-17 16:56:13 -08:00
Saleem Abdulrasool
6f096be5d5 build-script-impl: reorganise the option
This reorders the option list.  It tries to categorise them by area and
then sort them alphabetically.  This should help work through the list
and remove the now defunct options as well as try to reduce the set of
options into different build configurations that we can support and try
to organise the CMake invocations properly.

There is still a group of uncategorised options that should get sorted
out at some point.  However, this is still a huge step forward towards
simplifying (and hopefully eradicating) this monstrous script.
2020-01-17 12:01:25 -08:00
swift-ci
66b77e82a6 Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-17 11:44:01 -08:00
Saleem Abdulrasool
7691188f60 Merge pull request #29267 from xiaobai/simplify-common-c-flags
[build] Simplify common_cross_c_flags
2020-01-17 11:28:21 -08:00
swift-ci
5488e9aad9 Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-17 11:23:11 -08:00
Saleem Abdulrasool
8d21f1bc70 build-script: minor cleanup 2020-01-17 08:57:36 -08:00
Alex Langford
973b962c2f [build] Simplify common_cross_c_flags 2020-01-16 23:06:07 -08:00
swift-ci
5ce7e8404b Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-16 16:23:10 -08:00
Vedant Kumar
f562da97f0 build-script: Don't build compiler-rt for embedded devices (#29256)
Compiler-rt isn't needed for the on-device build.
2020-01-16 16:03:42 -08:00
Erik Eckstein
1b312a85bd Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-16 10:39:20 +01:00
Alex Langford
6ff8722227 [build] Remove function contains_product from build-script-impl 2020-01-14 18:13:24 -08:00
swift-ci
2078fd8259 Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-12 18:03:27 -08:00
Saleem Abdulrasool
988b660113 Merge pull request #28862 from xiaobai/fix-thinko
[build] Unify android-arm64 and android-aarch64 in build-script-impl
2020-01-12 17:52:25 -08:00
Arnold Schwaighofer
0c99cd9734 Merge remote-tracking branch 'origin/master' into master-rebranch 2020-01-10 08:00:41 -08:00
Eric Miotto
cdb4072e4b [build][gardening] obtain CMAKE_OSX_SYSROOT value once (#29098)
Supports rdar://problem/58347344
2020-01-09 14:21:54 -08:00
Jonas Devlieghere
6dc1cc1214 [build-script] Make optional dependencies mandatory for swift-lldb 2020-01-03 16:51:36 -08:00
swift_jenkins
b9fde199f0 Merge remote-tracking branch 'origin/master' into master-next 2020-01-02 13:19:16 -08:00
Saleem Abdulrasool
d0343aeb31 build: remove more unused functions (NFC)
These build-script-impl functions were not used.  Simply remove them as
they are no longer needed.
2020-01-02 10:25:20 -08:00
swift_jenkins
81c0ed297a Merge remote-tracking branch 'origin/master' into master-next 2020-01-02 10:19:08 -08:00
Saleem Abdulrasool
51365d9f69 Merge pull request #28961 from compnerd/dispatch-everything
build: remove remnants of libdispatch staging (NFC)
2020-01-02 10:10:00 -08:00
Saleem Abdulrasool
d228fb212d Merge pull request #28959 from compnerd/obsoleted
build: remove `USER_CONFIG_ARGS` (NFC)
2020-01-02 10:09:40 -08:00
Saleem Abdulrasool
5090203430 Merge pull request #28958 from compnerd/deprecated
build: remove workaround for CMake 3.4.0
2020-01-02 10:09:20 -08:00
Saleem Abdulrasool
d2681c0fbb Merge pull request #28957 from compnerd/unused
build: remove unnecessary variable (NFC)
2020-01-02 10:09:04 -08:00
Saleem Abdulrasool
ad94bc8f2e build: remove remnants of libdispatch staging (NFC)
libdispatch is required by Foundation.  The
`FOUNDATION_ENABLE_LIBDISPATCH` flag was removed a while ago from
Foundation itself.  Remove the handling for this option and simplify the
flag handling.
2019-12-27 16:03:30 -08:00
Saleem Abdulrasool
3b578ab25a build: remove USER_CONFIG_ARGS (NFC)
This was deprecated 4 years ago: obsolete the option.
2019-12-27 15:46:25 -08:00
Saleem Abdulrasool
14ecd9fa93 build: remove workaround for CMake 3.4.0
With the dependencies now requiring CMake 3.15, everything is built with
a newer CMake.  This removes the workaround for the 3.4 CMake release.
2019-12-27 15:42:29 -08:00
Saleem Abdulrasool
a1357c1bed build: remove unnecessary variable (NFC)
The `platform` variable already contains the SDK name, no need to create
a new variable for that.
2019-12-27 15:36:18 -08:00
Saleem Abdulrasool
34c7c2f209 build: remove some dead code (NFC)
This removes an unused function in `build-script-impl`.
2019-12-27 15:32:25 -08:00
swift_jenkins
a663792b87 Merge remote-tracking branch 'origin/master' into master-next 2019-12-18 18:59:52 -08:00
Alex Langford
540c0204a5 [build] Unify android-arm64 and android-aarch64 in build-script-impl 2019-12-18 14:57:30 -08:00
Alex Langford
a6fd37e128 [build] Remove make_relative_symlink from build-script-impl
Nothing uses this anymore, remove it.
2019-12-18 14:31:54 -08:00
swift_jenkins
51b5086758 Merge remote-tracking branch 'origin/master' into master-next 2019-12-17 07:59:58 -08:00
Eric Miotto
f67ccf5c9d Unset IFS after its use in set_build_options_for_host (#28811)
If IFS remains set, it may cause compilation errors due to unanticipated
replacement of characters in some parameters.

Addresses rdar://problem/57927748
2019-12-17 07:43:58 -08:00
swift_jenkins
0ae0336efa Merge remote-tracking branch 'origin/master' into master-next 2019-12-13 14:00:35 -08:00
Alex Langford
81e3c76c1d [build] Simplify setting SWIFT_HOST_VARIANT and related variables
In the majority of cases, we can derive the value of SWIFT_HOST_VARIANT,
SWIFT_HOST_VARIANT_SDK, and SWIFT_HOST_VARIANT_ARCH from the value of `host`
itself. The goal of this patch is to make those derivations and avoid lots of
manual setting of values. Because we verify that we have a valid host before
doing this, we can be sure that errors should be caught before we try to
deconstruct the host into platform and architecture values.

For situations where you can't derive those values from the host, we leave
existing behavior -- that is, we handle them in a switch statement.
2019-12-12 11:33:34 -08:00
Alex Langford
24d191d1e6 [build] Verify a host is supported when setting build options
By verifying that the host is supported before doing any operations, we can
assume that the host value is properly formed, meaning we can simplify the logic
to set values based on the host. Follow-up commits will do exactly that.
2019-12-12 11:32:00 -08:00
swift_jenkins
0896bef9f5 Merge remote-tracking branch 'origin/master' into master-next 2019-12-11 14:40:02 -08:00
Saleem Abdulrasool
3a24f59d15 Merge pull request #28667 from xiaobai/leaving-my-cmark
[build] Reduce redundancy in setting cmark cmake options
2019-12-11 14:26:40 -08:00