[Mesa-dev] [PATCH 4/8] drivers/nouveau: mention dummy.cpp to use g++ linker

Ilia Mirkin imirkin at alum.mit.edu
Mon Mar 31 19:12:56 PDT 2014


I presume you tested that nouveau_compiler still builds :)

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

On Mon, Mar 31, 2014 at 10:11 PM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> The build system does not know that the static library is C++.
> Mention the cpp file to trigger generation of the proper variable
> and drop the hacky stdc++ linking.
>
> Cc: Ilia Mirkin <imirkin at alum.mit.edu>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  src/gallium/drivers/nouveau/Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/nouveau/Makefile.am b/src/gallium/drivers/nouveau/Makefile.am
> index 27f829f..ef48380 100644
> --- a/src/gallium/drivers/nouveau/Makefile.am
> +++ b/src/gallium/drivers/nouveau/Makefile.am
> @@ -42,11 +42,11 @@ libnouveau_la_SOURCES = \
>
>  noinst_PROGRAMS = nouveau_compiler
>
> +nodist_EXTRA_nouveau_compiler_SOURCES = dummy.cpp
>  nouveau_compiler_SOURCES = \
>         nouveau_compiler.c
>
>  nouveau_compiler_LDADD = \
>         libnouveau.la \
>         ../../auxiliary/libgallium.la \
> -       -lstdc++ \
>         $(GALLIUM_COMMON_LIB_DEPS)
> --
> 1.9.1
>


More information about the mesa-dev mailing list