Merge branch 'master' of https://github.com/OpenELEC/OpenELEC.tv into mach_kernel

config/options

@@ -92,14 +92,17 @@ get_graphicdrivers() {
 
     if [ "$drv" = "i915" -o "$drv" = "i965" ]; then
       XORG_DRIVERS="$XORG_DRIVERS intel"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r200" -o "$drv" = "r300" -o "$drv" = "r600" -o "$drv" = "radeon" ]; then
       XORG_DRIVERS="$XORG_DRIVERS ati"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nouveau" ]; then
       XORG_DRIVERS="$XORG_DRIVERS nouveau"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nvidia" ]; then
@@ -113,10 +116,12 @@ get_graphicdrivers() {
 
     if [ "$drv" = "omapfb" ]; then
       XORG_DRIVERS="$XORG_DRIVERS ompafb"
+#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "vmware" ]; then
       XINERAMA_SUPPORT="yes"
+#      LLVM_SUPPORT="yes"
     fi
   done
 }

packages/devel/llvm-host/build

@@ -0,0 +1,66 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+$SCRIPTS/unpack llvm
+
+setup_toolchain host
+
+if [ "$TARGET_ARCH" = i386 ]; then
+  ARCH=x86
+elif [ "$TARGET_ARCH" = x86_64 ]; then
+  ARCH=x86_64
+fi
+
+LLVM_DIR=`ls -d $BUILD/llvm-[0-9]*`
+
+cd $LLVM_DIR
+
+cd autoconf
+  aclocal  --force --verbose -I m4
+  autoconf --force --verbose -I m4 -o ../configure
+cd ..
+
+mkdir -p .build-host && cd .build-host
+
+../configure --prefix=$ROOT/$TOOLCHAIN \
+             --enable-polly \
+             --enable-optimized \
+             --disable-profiling \
+             --disable-assertions \
+             --disable-expensive-checks \
+             --disable-debug-runtime \
+             --disable-debug-symbols \
+             --enable-jit \
+             --disable-docs \
+             --disable-doxygen \
+             --enable-threads \
+             --enable-pthreads \
+             --enable-pic \
+             --enable-shared \
+             --enable-embed-stdcxx \
+             --enable-timestamps \
+             --enable-targets=$ARCH \
+
+make
+make install

packages/devel/llvm-host/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="llvm"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://llvm.org/"
+PKG_URL=""
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="ccache"
+PKG_PRIORITY="optional"
+PKG_SECTION="toolchain/lang"
+PKG_SHORTDESC="llvm: Low Level Virtual Machine"
+PKG_LONGDESC="Low-Level Virtual Machine (LLVM) is a compiler infrastructure designed for compile-time, link-time, run-time, and "idle-time" optimization of programs from arbitrary programming languages. It currently supports compilation of C, Objective-C, and C++ programs, using front-ends derived from GCC 4.0, GCC 4.2, and a custom new front-end, "clang". It supports x86, x86-64, ia64, PowerPC, and SPARC, with support for Alpha and ARM under development."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/devel/llvm/build

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+# llvm fails to build with LTO support
+  strip_lto
+
+if [ "$TARGET_ARCH" = i386 ]; then
+  ARCH=x86
+elif [ "$TARGET_ARCH" = x86_64 ]; then
+  ARCH=x86_64
+fi
+
+LLVM_DIR=`ls -d $BUILD/llvm-[0-9]*`
+
+cd $LLVM_DIR
+
+mkdir -p .build-target && cd .build-target
+
+../configure --host=$TARGET_NAME \
+             --build=$HOST_NAME \
+             --prefix=/usr \
+             --enable-polly \
+             --enable-optimized \
+             --disable-profiling \
+             --disable-assertions \
+             --disable-expensive-checks \
+             --disable-debug-runtime \
+             --disable-debug-symbols \
+             --enable-jit \
+             --disable-docs \
+             --disable-doxygen \
+             --enable-threads \
+             --enable-pthreads \
+             --enable-pic \
+             --enable-shared \
+             --enable-embed-stdcxx \
+             --enable-timestamps \
+             --enable-targets=$ARCH \
+
+TBLGEN="$ROOT/$TOOLCHAIN/bin/tblgen" \
+TCLSH="$ROOT/$TOOLCHAIN/bin/tclsh" \
+make
+
+TBLGEN="$ROOT/$TOOLCHAIN/bin/tblgen" \
+TCLSH="$ROOT/$TOOLCHAIN/bin/tclsh" \
+$MAKEINSTALL

packages/devel/llvm/install

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/.build-target/Release/lib/libLLVM-*.so $INSTALL/usr/lib
+

packages/devel/llvm/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="llvm"
+PKG_VERSION="2.9"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://llvm.org/"
+PKG_URL="http://llvm.org/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain llvm-host"
+PKG_PRIORITY="optional"
+PKG_SECTION="toolchain/lang"
+PKG_SHORTDESC="llvm: Low Level Virtual Machine"
+PKG_LONGDESC="Low-Level Virtual Machine (LLVM) is a compiler infrastructure designed for compile-time, link-time, run-time, and "idle-time" optimization of programs from arbitrary programming languages. It currently supports compilation of C, Objective-C, and C++ programs, using front-ends derived from GCC 4.0, GCC 4.2, and a custom new front-end, "clang". It supports x86, x86-64, ia64, PowerPC, and SPARC, with support for Alpha and ARM under development."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/devel/llvm/patches/llvm-2.9-cross.patch

@@ -0,0 +1,105 @@
+diff -Naur llvm-2.9-old/autoconf/configure.ac llvm-2.9-new/autoconf/configure.ac
+--- llvm-2.9-old/autoconf/configure.ac	2011-03-25 00:56:32.000000000 -0700
++++ llvm-2.9-new/autoconf/configure.ac	2011-05-05 13:33:38.000000000 -0700
+@@ -384,6 +384,10 @@
+        AC_CHECK_PROG(BUILD_CXX, c++, c++, , , /usr/ucb/c++)
+      fi
+   fi
++  AC_SUBST(BUILD_CPPFLAGS)
++  AC_SUBST(BUILD_CFLAGS)
++  AC_SUBST(BUILD_CXXFLAGS)
++  AC_SUBST(BUILD_LDFLAGS)
+ else
+   AC_SUBST(LLVM_CROSS_COMPILING, [0])
+ fi
+diff -Naur llvm-2.9-old/autoconf/m4/build_exeext.m4 llvm-2.9-new/autoconf/m4/build_exeext.m4
+--- llvm-2.9-old/autoconf/m4/build_exeext.m4	2008-09-26 10:27:58.000000000 -0700
++++ llvm-2.9-new/autoconf/m4/build_exeext.m4	2011-05-05 12:29:10.000000000 -0700
+@@ -18,7 +18,7 @@
+      fi
+   fi
+   test -z "$BUILD_CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+-  ac_build_link='${BUILD_CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
++  ac_build_link='${BUILD_CC-cc} -o conftest $BUILD_CFLAGS $BUILD_CPPFLAGS $BUILD_LDFLAGS conftest.$ac_ext $LIBS 1>&AS_MESSAGE_LOG_FD'
+   rm -f conftest*
+   echo 'int main () { return 0; }' > conftest.$ac_ext
+   ac_cv_build_exeext=
+diff -Naur llvm-2.9-old/Makefile llvm-2.9-new/Makefile
+--- llvm-2.9-old/Makefile	2010-11-29 10:16:10.000000000 -0800
++++ llvm-2.9-new/Makefile	2011-05-05 13:35:06.000000000 -0700
+@@ -104,37 +104,6 @@
+   DIRS := $(filter-out unittests, $(DIRS))
+ endif
+ 
+-# If we're cross-compiling, build the build-hosted tools first
+-ifeq ($(LLVM_CROSS_COMPILING),1)
+-all:: cross-compile-build-tools
+-
+-clean::
+-	$(Verb) rm -rf BuildTools
+-
+-cross-compile-build-tools:
+-	$(Verb) if [ ! -f BuildTools/Makefile ]; then \
+-          $(MKDIR) BuildTools; \
+-	  cd BuildTools ; \
+-	  unset CFLAGS ; \
+-	  unset CXXFLAGS ; \
+-	  $(PROJ_SRC_DIR)/configure --build=$(BUILD_TRIPLE) \
+-		--host=$(BUILD_TRIPLE) --target=$(BUILD_TRIPLE); \
+-	  cd .. ; \
+-	fi; \
+-	(unset SDKROOT; \
+-	 $(MAKE) -C BuildTools \
+-	  BUILD_DIRS_ONLY=1 \
+-	  UNIVERSAL= \
+-	  ENABLE_OPTIMIZED=$(ENABLE_OPTIMIZED) \
+-	  ENABLE_PROFILING=$(ENABLE_PROFILING) \
+-	  ENABLE_COVERAGE=$(ENABLE_COVERAGE) \
+-	  DISABLE_ASSERTIONS=$(DISABLE_ASSERTIONS) \
+-	  ENABLE_EXPENSIVE_CHECKS=$(ENABLE_EXPENSIVE_CHECKS) \
+-	  CFLAGS= \
+-	  CXXFLAGS= \
+-	) || exit 1;
+-endif
+-
+ # Include the main makefile machinery.
+ include $(LLVM_SRC_ROOT)/Makefile.rules
+ 
+diff -Naur llvm-2.9-old/Makefile.config.in llvm-2.9-new/Makefile.config.in
+--- llvm-2.9-old/Makefile.config.in	2010-12-28 19:59:14.000000000 -0800
++++ llvm-2.9-new/Makefile.config.in	2011-05-05 12:25:34.000000000 -0700
+@@ -113,6 +113,10 @@
+ # call if we're cross-compiling).
+ BUILD_CC=@BUILD_CC@
+ BUILD_CXX=@BUILD_CXX@
++BUILD_CPPFLAGS=@BUILD_CPPFLAGS@
++BUILD_CFLAGS=@BUILD_CFLAGS@
++BUILD_CXXFLAGS=@BUILD_CXXFLAGS@
++BUILD_LDFLAGS=@BUILD_LDFLAGS@
+ 
+ # Triple for configuring build tools when cross-compiling
+ BUILD_TRIPLE=@build@
+diff -Naur llvm-2.9-old/Makefile.rules llvm-2.9-new/Makefile.rules
+--- llvm-2.9-old/Makefile.rules	2011-03-24 23:26:58.000000000 -0700
++++ llvm-2.9-new/Makefile.rules	2011-05-05 12:24:42.000000000 -0700
+@@ -647,15 +647,15 @@
+ 	         $(CPP.BaseFlags)
+ 
+ ifeq ($(BUILD_COMPONENT), 1)
+-  Compile.C     = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \
++  Compile.C     = $(BUILD_CC) $(CPP.Flags) $(C.Flags) $(BUILD_CFLAGS) $(BUILD_CPPFLAGS) \
+                   $(TargetCommonOpts) $(CompileCommonOpts) -c
+-  Compile.CXX   = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
++  Compile.CXX   = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \
+ 		  $(CPPFLAGS) \
+                   $(TargetCommonOpts) $(CompileCommonOpts) -c
+-  Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(CPPFLAGS) $(TargetCommonOpts) \
++  Preprocess.CXX= $(BUILD_CXX) $(CPP.Flags) $(BUILD_CPPFLAGS) $(TargetCommonOpts) \
+                   $(CompileCommonOpts) $(CXX.Flags) -E
+-  Link          = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(CXXFLAGS) \
+-		  $(LD.Flags) $(LDFLAGS) \
++  Link          = $(BUILD_CXX) $(CPP.Flags) $(CXX.Flags) $(BUILD_CXXFLAGS) \
++		  $(LD.Flags) $(BUILD_LDFLAGS) \
+                   $(TargetCommonOpts) $(CompileCommonOpts) $(Strip)
+ else
+   Compile.C     = $(CC) $(CPP.Flags) $(C.Flags) $(CFLAGS) $(CPPFLAGS) \

packages/graphics/Mesa/build

@@ -36,29 +36,42 @@ MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915
 MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r300 --disable-gallium-r600"
 MESA_CONFIG="$MESA_CONFIG --disable-gallium-svga --disable-gallium-swrast"
 
+if [ "$LLVM_SUPPORT" = "yes" ]; then
+  export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
+  MESA_CONFIG="$MESA_CONFIG --enable-gallium --enable-gallium-llvm"
+fi
+
 for drv in $GRAPHIC_DRIVERS; do
-  [ "$drv" = i915 ] && \
+  if [ "$drv" = i915 ]; then
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i915/disable-gallium-i915/'`
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i915/enable-gallium-i915/'`
-
-  [ "$drv" = i965 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/disable-gallium-i965/'`
-
-  [ "$drv" = r300 -o "$drv" = radeon ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/enable-gallium-radeon/'` && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/enable-gallium-r300/'` && \
     MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
 
-  [ "$drv" = r600 ] && \
+  if [ "$drv" = i965 ]; then
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/enable-gallium-r600/'` && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-i965/enable-gallium-i965/'`
     MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
 
-  [ "$drv" = nouveau ] && \
+  if [ "$drv" = r300 -o "$drv" = radeon ]; then
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-nouveau/enable-gallium-nouveau/'` && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/enable-gallium-radeon/'`
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r300/enable-gallium-r300/'`
     MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
 
-  [ "$drv" = vmware ] && \
+  if [ "$drv" = r600 ]; then
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-svga/enable-gallium-svga/'` && \
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/enable-gallium-r600/'`
     MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
+
+  if [ "$drv" = nouveau ]; then
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-nouveau/enable-gallium-nouveau/'`
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
+
+  if [ "$drv" = vmware ]; then
+    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-svga/enable-gallium-svga/'`
+    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx --enable-gallium"
+  fi
 done
 
 cd $PKG_BUILD

packages/graphics/Mesa/meta

@@ -35,6 +35,13 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
 
+get_graphicdrivers
+
+if [ "$LLVM_SUPPORT" = "yes" ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS llvm"
+  PKG_DEPENDS="$PKG_DEPENDS llvm"
+fi
+
 if [ "$MESA_MASTER" = "yes" ]; then
   PKG_VERSION="7.11-git2812b60"
   PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/graphics/Mesa/patches/Mesa-7.10.2-llvm_so.patch

@@ -0,0 +1,12 @@
+diff -Naur Mesa-7.10.2-old/configure.ac Mesa-7.10.2-new/configure.ac
+--- Mesa-7.10.2-old/configure.ac	2011-02-11 14:49:47.000000000 -0800
++++ Mesa-7.10.2-new/configure.ac	2011-05-05 16:31:18.000000000 -0700
+@@ -1551,7 +1551,7 @@
+     if test "x$LLVM_CONFIG" != xno; then
+ 	LLVM_VERSION=`$LLVM_CONFIG --version`
+ 	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
+-	LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter` -lstdc++"
++	LLVM_LIBS="-lLLVM-$LLVM_VERSION -lstdc++"
+ 
+ 	if test "x$HAS_UDIS86" != xno; then
+ 	    LLVM_LIBS="$LLVM_LIBS -ludis86"

packages/graphics/Mesa/patches/Mesa-7.10.2-llvmpipe_ld.patch

@@ -0,0 +1,12 @@
+diff -Naur Mesa-7.10.2-old/src/gallium/drivers/llvmpipe/Makefile Mesa-7.10.2-new/src/gallium/drivers/llvmpipe/Makefile
+--- Mesa-7.10.2-old/src/gallium/drivers/llvmpipe/Makefile	2011-01-04 09:44:17.000000000 -0800
++++ Mesa-7.10.2-new/src/gallium/drivers/llvmpipe/Makefile	2011-05-05 15:48:06.000000000 -0700
+@@ -71,7 +71,7 @@
+ 
+ LDFLAGS += $(LLVM_LDFLAGS)
+ LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
+-LD=g++
++LD = $(CXX)
+ 
+ $(PROGS): lp_test_main.o libllvmpipe.a
+