diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-18 10:12:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-18 10:12:07 +0200 |
| commit | 980040093547dc8dd563d8cb9d003aa39737eda4 (patch) | |
| tree | c85afeb4affd10ee0d6001d18569510ef6488272 /mesalib/configure.ac | |
| parent | 01102cdf33d68a7be192a139752831ff93dee117 (diff) | |
| parent | 2ff5448bcca8cba4b62026d5493cb08aaf2838d8 (diff) | |
| download | vcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.tar.gz vcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.tar.bz2 vcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/.gitignore
xorg-server/Xext/panoramiX.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboardinit.c
xorg-server/hw/xwin/winclipboardthread.c
xorg-server/hw/xwin/winclipboardunicode.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winclipboardxevents.c
xorg-server/hw/xwin/wincreatewnd.c
xorg-server/hw/xwin/windialogs.c
xorg-server/hw/xwin/winerror.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winmultiwindowwm.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 9227474f1..1d60957af 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1847,9 +1847,9 @@ if test "x$enable_gallium_llvm" = xyes; then dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, LLVM_LIBS="-lLLVM-`$LLVM_CONFIG --version`" else - LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter`" + LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter mcjit`" if test "x$enable_opencl" = xyes; then - LLVM_LIBS="${LLVM_LIBS} `llvm-config --libs ipo linker instrumentation`" + LLVM_LIBS="${LLVM_LIBS} `$LLVM_CONFIG --libs ipo linker instrumentation`" fi fi LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` @@ -2007,7 +2007,7 @@ if test "x$with_gallium_drivers" != x; then USE_R600_LLVM_COMPILER=yes; fi if test "x$enable_opencl" = xyes -a "x$with_llvm_shared_libs" = xno; then - LLVM_LIBS="${LLVM_LIBS} `llvm-config --libs bitreader asmparser`" + LLVM_LIBS="${LLVM_LIBS} `$LLVM_CONFIG --libs bitreader asmparser`" fi gallium_check_st "radeon/drm" "dri-r600" "xorg-r600" "" "xvmc-r600" "vdpau-r600" "va-r600" ;; |