[Mesa-dev] [PATCH] configuire.ac: honour LLVM_LIBDIR when linking against LLVM

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

On Oct 24, 2016 7:21 PM, "Emil Velikov" <emil.l.velikov at gmail.com> wrote:

> From: Emil Velikov <emil.velikov at collabora.com>
>
> Currently if one uses a non-default prefix, the path won't get
> propagated and we'll fail at link-time.
>
> A very quick and easy example is to install to /usr/local.
> At this point, llvm-config will be picked even without the
> --with-llvm-prefix, but regardless of the latter linking will fail.
>
> Currently people can workaround that via LD_LIBRARY_PATH.
>
> Cc: "12.0 13.0" <mesa-stable at lists.freedesktop.org>
> Cc: Tom Stellard <thomas.stellard at amd.com>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> Can a brave soul, familiar with llvm, help us stop the manual
> llvm-config parsing and prep llvm.pc +
> llvm-{$component-foo,$component-bar}.pc ?
> ---
>  configure.ac | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index d215b63..7d988f5 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1986,8 +1986,6 @@ AC_SUBST([LLVM_BINDIR])
>  AC_SUBST([LLVM_CFLAGS])
>  AC_SUBST([LLVM_CPPFLAGS])
>  AC_SUBST([LLVM_CXXFLAGS])
> -AC_SUBST([LLVM_LIBDIR])
> -AC_SUBST([LLVM_LIBS])
>  AC_SUBST([LLVM_LDFLAGS])
>  AC_SUBST([LLVM_INCLUDEDIR])
>  AC_SUBST([LLVM_VERSION])
> @@ -2540,7 +2538,9 @@ if test "x$MESA_LLVM" != x0; then
>              LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --system-libs`"
>          fi
>      fi
> +    LLVM_LIBS="$LLVM_LIBDIR $LLVM_LIBS"
>  fi
> +AC_SUBST([LLVM_LIBS])
>
>  AM_CONDITIONAL(HAVE_GALLIUM_SVGA, test "x$HAVE_GALLIUM_SVGA" = xyes)
>  AM_CONDITIONAL(HAVE_GALLIUM_I915, test "x$HAVE_GALLIUM_I915" = xyes)
> --
> 2.10.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20161029/00e17585/attachment.html>