path: root/
diff options
authorEmil Velikov <>2014-03-04 20:02:35 +0000
committerEmil Velikov <>2014-03-11 12:50:44 +0000
commit065b6ca52b6a34b1fa6713f41641738401e47710 (patch)
tree512dbaf3521ff4c67cd881fcb4d83b67c031adf0 /
parente267e4318c0f1cc30acbd06afab44ecec9aada2e (diff)
configure: update enable-llvm-shared-libs comments
- As of commit cb080a10b68( Don't require shared LLVM when building OpenCL) opencl does not mandate using shared llvm. - Add a warning message that building with static llvm may cause compilation problems. Signed-off-by: Emil Velikov <> Reviewed-by: Jon TURNEY <> Reviewed-by: Tom Stellard <>
Diffstat (limited to '')
1 files changed, 10 insertions, 13 deletions
diff --git a/ b/
index 4f78e65ea69..a8131cf70b2 100644
--- a/
+++ b/
@@ -589,10 +589,8 @@ AC_ARG_ENABLE([omx],
- [enable OpenCL library NOTE: Enabling this option will also enable
- --enable-llvm-shared-libs
- @<:@default=no@:>@])],
- [],
+ [enable OpenCL library @<:@default=no@:>@])],
+ [enable_opencl="$enableval"],
@@ -1514,8 +1512,8 @@ AC_ARG_ENABLE([gallium-llvm],
[link with LLVM shared libraries @<:@default=enabled@:>@])],
- [],
- [with_llvm_shared_libs=yes])
+ [enable_llvm_shared_libs="$enableval"],
+ [enable_llvm_shared_libs=yes])
@@ -1857,7 +1855,7 @@ if test "x$MESA_LLVM" != x0; then
- if test "x$with_llvm_shared_libs" = xyes; then
+ if test "x$enable_llvm_shared_libs" = xyes; then
dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
AS_IF([test -f "$LLVM_LIBDIR/lib$"], [llvm_have_one_so=yes])
@@ -1874,18 +1872,17 @@ if test "x$MESA_LLVM" != x0; then
and that your llvm libraries are installed in $LLVM_LIBDIR
If you have installed your llvm libraries to a different directory you
can use the --with-llvm-prefix= configure flag to specify this directory.
- NOTE: Mesa is attempting to use llvm shared libraries because you have
- passed one of the following options to configure:
- --enable-llvm-shared-libs
- --enable-opencl
+ NOTE: Mesa is attempting to use llvm shared libraries by default.
If you do not want to build with llvm shared libraries and instead want to
- use llvm static libraries then remove these options from your configure
- invocation and reconfigure.])])
+ use llvm static libraries then add --disable-llvm-shared-libs to your configure
+ invocation and rebuild.])])
dnl We don't need to update LLVM_LIBS in this case because the LLVM
dnl install uses a shared object for each compoenent and we have
dnl already added all of these objects to LLVM_LIBS.
+ else
+ AC_MSG_WARN([Building mesa with staticly linked LLVM may cause compilation issues])