diff options
author | Ron Olson <tachoknight@gmail.com> | 2018-06-25 21:48:14 -0500 |
---|---|---|
committer | Ron Olson <tachoknight@gmail.com> | 2018-06-25 21:48:14 -0500 |
commit | e361bb18e3ce9fc3857756f36372a31f45362253 (patch) | |
tree | bad47ff9d8397b17e74ec4cda66df8b04051d43c | |
parent | 3fc738f0e762d2d66d023d7597ec69cf361a8b4c (diff) | |
download | swift-lang-e361bb18e3ce9fc3857756f36372a31f45362253.tar.gz swift-lang-e361bb18e3ce9fc3857756f36372a31f45362253.tar.xz swift-lang-e361bb18e3ce9fc3857756f36372a31f45362253.zip |
Set the environment variable for the toolchain build
-rw-r--r-- | set-environ-variable.patch | 12 | ||||
-rw-r--r-- | swift-lang.spec | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/set-environ-variable.patch b/set-environ-variable.patch new file mode 100644 index 0000000..9828cbc --- /dev/null +++ b/set-environ-variable.patch @@ -0,0 +1,12 @@ +--- swift/utils/build-script-impl.orig 2018-06-25 16:26:15.753466272 -0500 ++++ swift/utils/build-script-impl 2018-06-25 16:26:15.747466273 -0500 +@@ -18,6 +18,9 @@ + # Note: This script will NOT auto-clean before building. + # + ++SWIFT_BUILD_FOR_FEDORA=1 ++export SWIFT_BUILD_FOR_FEDORA ++ + set -o pipefail + set -e + diff --git a/swift-lang.spec b/swift-lang.spec index 0754f95..113b183 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -29,6 +29,7 @@ Patch1: compiler-rt-no-ustat.patch Patch2: no-ninja-build.patch Patch3: time-struct-redefined.patch Patch4: integration-tests.patch +Patch5: set-environ-variable.patch BuildRequires: which @@ -110,6 +111,9 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo # the correct version of clang when testing %patch4 -p0 +# Sets the environment variable SWIFT_BUILD_FOR_FEDORA for the toolchain build +%patch5 -p0 + %build export VERBOSE=1 |