[llvm/f15] Fix incorrect platform-specific include path on i686
Michel Alexandre Salim
salimma at fedoraproject.org
Tue Aug 2 15:01:45 UTC 2011
commit 66fa449574d647a9d9413ea421503015cd919aa9
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Tue Aug 2 00:03:34 2011 +0200
Fix incorrect platform-specific include path on i686
llvm.spec | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/llvm.spec b/llvm.spec
index ec62c8e..44cdb5e 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -255,9 +255,11 @@ popd
--enable-shared \
--with-c-include-dirs=%{_includedir}:$(find %{_prefix}/lib/gcc/*/* \
-maxdepth 0 -type d)/include \
+%if %{__isa_bits} == 64
+ --with-cxx-include-32bit-dir=32 \
+%endif
--with-cxx-include-root=$(find %{_includedir}/c++/* -maxdepth 0 -type d) \
- --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os} \
- --with-cxx-include-32bit-dir=32
+ --with-cxx-include-arch=%{_target_cpu}-%{_vendor}-%{_os} \
# FIXME file this
# configure does not properly specify libdir
@@ -345,8 +347,10 @@ find examples -name 'Makefile' | xargs -0r rm -f
%check
-make check
-(cd tools/clang && make test)
+# the Koji build server does not seem to have enough RAM
+# for the default 16 threads
+make check LIT_ARGS="-s -v -j8"
+make -C tools/clang/test
%post libs -p /sbin/ldconfig
@@ -464,7 +468,8 @@ exit 0
* Tue Aug 2 2011 Michel Salim <salimma at fedoraproject.org> - 2.8-12
- Depend on libffi to allow the LLVM interpreter to call external functions
- Build with RTTI enabled, needed by e.g. Rubinius (# 722714)
-- Fix multilib installation
+- Fix multilib installation (# 699416)
+- Fix incorrect platform-specific include path on i686
* Tue Apr 26 2011 Adam Jackson <ajax at redhat.com> 2.8-11
- llvm-2.8-disable-avx.patch: Disable AVX code generation. (#699896)
More information about the scm-commits
mailing list