rpms/llvm
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/llvm.git synced 2024-12-01 03:32:55 +00:00
Code Issues 5 Projects Releases Packages Wiki Activity Actions

Merge with el6 branch

Browse source
This commit is contained in:
Dave Johansen 2014-11-15 09:40:06 -07:00
commit aa0776fa35
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
0004-devtoolset.patch Normal file
View file

@ -0,0 +1,17 @@
--- a/tools/clang/lib/Driver/ToolChains.cpp 2014-08-27 22:07:31.000000000 +0200
+++ b/tools/clang/lib/Driver/ToolChains.cpp 2014-09-08 02:51:38.197987523 +0200
@@ -1249,8 +1249,13 @@
Prefixes.push_back(D.InstalledDir + "/..");
// And finally in /usr.
- if (D.SysRoot.empty())
+ if (D.SysRoot.empty()) {
+ Prefixes.push_back("/opt/rh/devtoolset-3/root/usr");
+ Prefixes.push_back("/opt/rh/devtoolset-2/root/usr");
+ Prefixes.push_back("/opt/rh/devtoolset-1.1/root/usr");
+ Prefixes.push_back("/opt/rh/devtoolset-1.0/root/usr");
Prefixes.push_back("/usr");
+ }
}
// Loop over the various components which exist and select the best GCC

7
llvm.spec
View file

@ -49,7 +49,7 @@ Obsoletes: pure <= 0.55
Name: llvm Name: llvm
Version: %{version_base}.2 Version: %{version_base}.2
Release: 1%{?dist} Release: 2%{?dist}
Summary: The Low Level Virtual Machine Summary: The Low Level Virtual Machine
Group: Development/Languages Group: Development/Languages
@ -72,6 +72,7 @@ Source11: llvm-Config-llvm-config.h
Patch1: 0001-data-install-preserve-timestamps.patch Patch1: 0001-data-install-preserve-timestamps.patch
Patch2: 0002-linker-flags-speedup-memory.patch Patch2: 0002-linker-flags-speedup-memory.patch
Patch3: 0003-amazon-triples.patch Patch3: 0003-amazon-triples.patch
Patch4: 0004-devtoolset.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: chrpath BuildRequires: chrpath
@ -299,6 +300,7 @@ mv lldb-%{version_base} tools/lldb
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
# fix library paths # fix library paths
sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' ./configure sed -i 's|/lib /usr/lib $lt_ld_extra|%{_libdir} $lt_ld_extra|' ./configure
@ -667,6 +669,9 @@ exit 0
%endif %endif
%changelog %changelog
* Sat Nov 15 2014 Dave Johansen <davejohansen@gmail.com> 3.4.2-2
- Adding support for using devtoolset
* Sun Aug 03 2014 Dave Johansen <davejohansen@gmail.com> 3.4.2-1 * Sun Aug 03 2014 Dave Johansen <davejohansen@gmail.com> 3.4.2-1
- Updated to 3.4.2 - Updated to 3.4.2