Merge branch 'master' into f14

2010-11-27 17:39:58 +01:00 · 2010-11-27 17:39:58 +01:00 · 775aace187
commit 775aace187
parent 67f86fc612 e60dbac558
1 changed files with 3 additions and 2 deletions
--- a/llvm.spec
+++ b/llvm.spec
@ -222,8 +222,9 @@ popd
  --enable-debug-runtime \
  --enable-jit \
  --enable-shared \
-  --with-c-include-dirs=%{_includedir}:$(echo %{_prefix}/lib/gcc/*/*/include) \
-  --with-cxx-include-root=$(echo %{_includedir}/c++/*) \
+  --with-c-include-dirs=%{_includedir}:$(find %{_prefix}/lib/gcc/*/* \
+      -maxdepth 0 -type d)/include \
+  --with-cxx-include-root=$(find %{_includedir}/c++/* -maxdepth 0 -type d) \
  --with-cxx-include-arch=%{_arch}-%{_vendor}-%{_os}

 # FIXME file this