summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--swift-lang.conf2
-rw-r--r--swift-lang.spec14
2 files changed, 14 insertions, 2 deletions
diff --git a/swift-lang.conf b/swift-lang.conf
index a7c6311..e1b9129 100644
--- a/swift-lang.conf
+++ b/swift-lang.conf
@@ -1,2 +1,2 @@
/usr/lib64/swift-lldb
-/usr/lib64/swift-lldb/swift/linux
+/usr/lib64/swift/linux
diff --git a/swift-lang.spec b/swift-lang.spec
index 5092e43..203b08a 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -101,9 +101,19 @@ install -m 0755 %{_builddir}/usr/bin/liblldb-intel-mpxtable.so %{buildroot}%{_li
install -m 0755 %{_builddir}/usr/bin/repl_swift %{buildroot}%{_libexecdir}/swift-lldb
mkdir -p %{buildroot}/%{_libdir}/swift-lldb
-cp -r %{_builddir}/usr/lib/* %{buildroot}%{_libdir}/swift-lldb
+cp -r %{_builddir}/usr/lib/lldb %{buildroot}%{_libdir}/swift-lldb
+cp -r %{_builddir}/usr/lib/python2.7 %{buildroot}%{_libdir}/swift-lldb
+cp %{_builddir}/usr/lib/liblldb* %{buildroot}%{_libdir}/swift-lldb
+cp %{_builddir}/usr/lib/libsourcekitdInProc.so %{buildroot}%{_libdir}/swift-lldb
+cp %{_builddir}/usr/lib/libswiftDemangle.so %{buildroot}%{_libdir}/swift-lldb
ln -fs %{_bindir}/swift %{buildroot}%{_libexecdir}/swift-lldb/swift
+mkdir -p %{buildroot}/%{_libdir}/swift
+cp -r %{_builddir}/usr/lib/swift/* %{buildroot}/%{_libdir}/swift
+
+mkdir -p %{buildroot}/%{_libdir}/swift_static
+cp -r %{_builddir}/usr/lib/swift_static/* %{buildroot}/%{_libdir}/swift_static
+
cp -r %{_builddir}%{_includedir}/* %{buildroot}%{_includedir}
mv %{buildroot}%{_includedir}/lldb %{buildroot}%{_includedir}/swift-lldb
@@ -122,6 +132,8 @@ cp %{_builddir}/usr/share/swift/LICENSE.txt %{buildroot}%{_datarootdir}/swift
%{_datarootdir}/swift/LICENSE.txt
%{_includedir}/*
%{_libdir}/swift-lldb/*
+%{_libdir}/swift/*
+%{_libdir}/swift_static/*
%{_libexecdir}/swift-lldb/*
%{_sysconfdir}/ld.so.conf.d/swift-lang.conf