https://bugs.freedesktop.org/show_bug.cgi?id=45466
Bug #: 45466 Summary: Updated configure.ac check for llvm-config to use 32 version when appropriate Classification: Unclassified Product: Mesa Version: git Platform: Other OS/Version: All Status: NEW Severity: normal Priority: medium Component: Mesa core AssignedTo: mesa-dev@lists.freedesktop.org ReportedBy: kdeko...@yahoo.com diff --git a/configure.ac b/configure.ac index 0e03af7..6400638 100644 --- a/configure.ac +++ b/configure.ac @@ -1762,14 +1762,25 @@ if test "x$enable_gallium_llvm" = xauto; then esac fi if test "x$enable_gallium_llvm" = xyes; then - AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no]) + if test "x$enable_32bit" = xyes; then + AC_PATH_PROG([LLVM_CONFIG], [llvm-config-32], [no]) + LLVM_LDFLAGS_ADD="-m32" + fi + if test "x$enable_64" = xyes; then + AC_PATH_PROG([LLVM_CONFIG], [llvm-config-64], [no]) + LLVM_LDFLAGS_ADD="-m64" + fi + if test "x$LLVM_CONFIG" = x; then + AC_PATH_PROG([LLVM_CONFIG], [llvm-config], [no]) + fi if test "x$LLVM_CONFIG" != xno; then LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'` - LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-ped + LLVM_CFLAGS=`$LLVM_CONFIG --cxxflags|sed -e 's/-DNDEBUG\>//g' -e 's/-ped LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter`" LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags` + LLVM_LDFLAGS="$LLVM_LDFLAGS $LLVM_LDFLAGS_ADD" DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS" MESA_LLVM=1 else -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev