llvm: really move compiler-rt this time, and disable lldb in cross for now.

srcpkgs/llvm/template

@@ -2,7 +2,7 @@
 pkgname=llvm
 version=3.5.1
 wrksrc="llvm-${version}.src"
-revision=3
+revision=4
 lib32disabled=yes
 configure_args="--disable-expensive-checks --disable-debug-runtime
  --enable-bindings=none --enable-optimized --enable-shared --enable-libffi
@@ -28,18 +28,24 @@ checksum="
 hostmakedepends="groff perl python zlib-devel libffi-devel swig"
 makedepends="python-devel zlib-devel libffi-devel libedit-devel"
 
+subpackages="clang clang-analyzer libllvm llvm-docs"
+if [ -z "$CROSS_BUILD" ]; then
+	# XXX fails to cross compile due to python
+	subpackages+=" lldb lldb-devel"
+fi
+
 post_extract() {
 	# Move clang files into the llvm source.
 	if [ -d ${XBPS_BUILDDIR}/cfe-${version}.src ]; then
 		mv ${XBPS_BUILDDIR}/cfe-${version}.src ${wrksrc}/tools/clang
 	fi
 	# Move lldb files into the llvm source.
-	if [ -d ${XBPS_BUILDDIR}/lldb-${version}.src ]; then
+	if [ -z "$CROSS_BUILD" -a -d ${XBPS_BUILDDIR}/lldb-${version}.src ]; then
 		mv ${XBPS_BUILDDIR}/lldb-${version}.src ${wrksrc}/tools/lldb
 	fi
 	# Move compiler-rt files into the llvm source.
-	if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version} ]; then
-		mv ${XBPS_BUILDDIR}/compiler-rt-${version} ${wrksrc}/projects/compiler-rt
+	if [ -d ${XBPS_BUILDDIR}/compiler-rt-${version}.src ]; then
+		mv ${XBPS_BUILDDIR}/compiler-rt-${version}.src ${wrksrc}/projects/compiler-rt
 	fi
 }
 
@@ -58,7 +64,6 @@ do_configure() {
 
 do_build() {
 	unset CC CXX CPP AR AS RANLIB CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-
 	cd build
 	make ${makejobs}
 }
@@ -107,7 +112,6 @@ clang-analyzer_package() {
 		ln -sf /usr/bin/clang ${PKGDESTDIR}/usr/lib/${pkgname}/scan-build
 	}
 }
-
 clang_package() {
 	lib32disabled=yes
 	depends="libstdc++-devel binutils gcc"