[Mesa-dev] Mesa (master): configure.ac: honour LLVM_LIBDIR when linking against LLVM

[Emil Velikov]

On 10 November 2016 at 06:46, Michel Dänzer <michel at daenzer.net> wrote:
> On 10/11/16 06:47 AM, Emil Velikov wrote:
>> Module: Mesa
>> Branch: master
>> Commit: a39ad185932eab4f25a0cb2b112c10d8700ef242
>> URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a39ad185932eab4f25a0cb2b112c10d8700ef242
>>
>> Author: Emil Velikov <emil.velikov at collabora.com>
>> Date:   Mon Oct 24 18:11:33 2016 +0100
>>
>> configure.ac: honour LLVM_LIBDIR when linking against LLVM
>>
>> 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>
>> Reviewed-by: Marek Olšák <marek.olsak at amd.com>
>>
>> ---
>>
>>  configure.ac | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 4761c59..2181313 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -1985,8 +1985,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])
>> @@ -2542,7 +2540,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])
>
> This broke llvmpipe's make check for me, see below. Prepending -L to
> $LLVM_LIBDIR fixes it; however, $LLVM_LDFLAGS already contains
> -L$LLVM_LIBDIR, so maybe the problem you were trying to fix (what was
> that exactly?) could be fixed by just adding/moving LLVM_LDFLAGS in the
> right places?
>
After another run with different LLVM I cannot reproduce the issue.
I've reverted the patch, until I get to the bottom of it - likely I've
butchered during the LLVM (re)build.

Sorry :-\
Emil