summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Atkins <chuck.atkins@kitware.com>2018-01-23 08:52:46 -0500
committerEmil Velikov <emil.l.velikov@gmail.com>2018-02-09 03:50:10 +0000
commit557f2cd46c0284247911ed742edec84785b52202 (patch)
tree3ed2dfe1e29a7dfd62c171687778f47aa2cd6115
parentf23257b623c3af9d8e5c8338dd0bd215ee43eb61 (diff)
configure.ac: add missing llvm dependencies to .pc files
v2: Only add as dependencies for gallium-osmesa and gallium-xlib CC: <mesa-stable@lists.freedesktop.org> Signed-of-by: Chuck Atkins <chuck.atkins@kitware.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> (cherry picked from commit 6ac5e851f1a0b83d84156bc79983fd9527d4c296)
-rw-r--r--configure.ac12
1 files changed, 12 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index a02173f2442..73f1d6574f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2711,6 +2711,18 @@ if test "x$enable_llvm" = xyes; then
fi
fi
fi
+
+ dnl The gallium-xlib GLX and gallium OSMesa targets directly embed the
+ dnl swr/llvmpipe driver into the final binary. Adding LLVM_LIBS results in
+ dnl the LLVM library propagated in the Libs.private of the respective .pc
+ dnl file which ensures complete dependency information when statically
+ dnl linking.
+ if test "x$enable_glx" == xgallium-xlib; then
+ GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $LLVM_LIBS"
+ fi
+ if test "x$enable_gallium_osmesa" = xyes; then
+ OSMESA_PC_LIB_PRIV="$OSMESA_PC_LIB_PRIV $LLVM_LIBS"
+ fi
fi
AM_CONDITIONAL(HAVE_GALLIUM_SVGA, test "x$HAVE_GALLIUM_SVGA" = xyes)