diff options
| author | Ron Olson <tachoknight@gmail.com> | 2018-06-26 10:44:17 -0500 |
|---|---|---|
| committer | Ron Olson <tachoknight@gmail.com> | 2018-06-26 10:44:17 -0500 |
| commit | fb8644a13ae85df46ec7672783ef341a1ca2b232 (patch) | |
| tree | 69cad26684e06b0773042fc1c789bae8fad21d9e | |
| parent | e361bb18e3ce9fc3857756f36372a31f45362253 (diff) | |
| download | swift-lang-fb8644a13ae85df46ec7672783ef341a1ca2b232.tar.gz swift-lang-fb8644a13ae85df46ec7672783ef341a1ca2b232.tar.xz swift-lang-fb8644a13ae85df46ec7672783ef341a1ca2b232.zip | |
Added Swift-specific clang to package
| -rw-r--r-- | swift-lang.spec | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/swift-lang.spec b/swift-lang.spec index 113b183..85eb38f 100644 --- a/swift-lang.spec +++ b/swift-lang.spec @@ -2,6 +2,7 @@ %global swifttag 4.2-DEVELOPMENT-SNAPSHOT-2018-06-23-a %global swiftgithash 1e07724 %global swiftgitdate 20180623 +%global swiftbuild swift-source Name: swift-lang Version: 4.2 Release: 0.20.%{swiftgitdate}git%{swiftgithash}%{?dist} @@ -72,7 +73,7 @@ correct programs easier for the developer. %prep -%setup -q -c -n swift-source -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 +%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 # The Swift build script requires directories to be named # in a specific way so renaming the source directories is @@ -124,6 +125,7 @@ swift/utils/build-script --preset=buildbot_linux,no_test install_destdir=%{_buil %install export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0 mkdir -p %{buildroot}%{_libexecdir}/swift-lldb +mkdir -p %{buildroot}%{_libexecdir}/swift-clang mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}/usr/lib mkdir -p %{buildroot}%{_includedir} @@ -160,6 +162,15 @@ ln -fs liblldbIntelFeatures.so.6.0.0 %{buildroot}/usr/lib/swift-lldb/liblldbInte ln -fs liblldbIntelFeatures.so.6 %{buildroot}/usr/lib/swift-lldb/liblldbIntelFeatures.so ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift +# We include our Swift-specific version of clang as it has additional functionality to +# work with Swift in conjunction with other languages. +mkdir -p %{buildroot}%{_libexecdir}/swift-clang +install -m 0755 %{_builddir}/%{swiftbuild}/build/buildbot_linux/llvm-linux-x86_64/bin/clang-6.0 %{buildroot}%{_libexecdir}/swift-clang +ln -fs clang-6.0 %{buildroot}/usr/libexec/swift-clang/clang +ln -fs clang-6.0 %{buildroot}/usr/libexec/swift-clang/clang++ +ln -fs clang-6.0 %{buildroot}/usr/libexec/swift-clang/clang-cl +ln -fs clang-6.0 %{buildroot}/usr/libexec/swift-clang/clang-cpp + mkdir -p %{buildroot}/usr/lib/swift cp -r %{_builddir}/usr/lib/swift/* %{buildroot}/usr/lib/swift ln -fs /usr/lib/swift %{buildroot}/usr/lib/swift-lldb/swift |