[Mesa-dev] [PATCH v2] swr: fix swr linkage so that static llvm works

[Emil Velikov]

On 17 May 2016 at 23:36, Tim Rowley <timothy.o.rowley at intel.com> wrote:
> ---
>  src/gallium/drivers/swr/Makefile.am | 17 ++++++++++++++++-
>  1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
> index 6915aae..72d0ac4 100644
> --- a/src/gallium/drivers/swr/Makefile.am
> +++ b/src/gallium/drivers/swr/Makefile.am
> @@ -102,7 +102,16 @@ rasterizer/jitter/builder_x86.cpp: rasterizer/jitter/scripts/gen_llvm_ir_macros.
>
>  COMMON_LIBADD = \
>         $(top_builddir)/src/gallium/auxiliary/libgallium.la \
> -       $(top_builddir)/src/mesa/libmesagallium.la
> +       $(top_builddir)/src/mesa/libmesagallium.la \
> +       $(LLVM_LIBS)
> +
> +COMMON_LDFLAGS = \
> +       -shared \
> +       -module \
> +       -no-undefined \
> +       $(GC_SECTIONS) \
> +       $(NO_UNDEFINED) \
> +       $(LLVM_LDFLAGS)
>
Should have made this clearer - original patch was great as is, and
the extra LDFLAGS mentioned were meant as a follow-up patch.

Please go with the original and add the extra bits separately - you
can mention "Will allow us to catch issues fixed with previous patch"
or alike.

A pre-emptive Acked-by: Emil Velikov <emil.velikov at collabora.com> on
the follow-up, which you can merge directly if you like.

Thanks
Emil