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

[Emil Velikov]

On 01/04/14 03:12, Ilia Mirkin wrote:
> I presume you tested that nouveau_compiler still builds :)
> 
Of course, but only build tested. Here is the full config I've used.

../autogen.sh \
  --with-dri-drivers= --with-gallium-drivers="r300,r600,nouveau" \
  --enable-glx-tls --enable-shared-glapi --enable-texture-float --enable-xa \
  --enable-xvmc --enable-vdpau --enable-omx --enable-gbm --enable-egl \
  --enable-gallium-gbm --enable-gallium-egl --enable-driglx-direct \
  --enable-dri --disable-dri3 --disable-gles1 --disable-gles2 \
  --enable-gallium-llvm \
  --enable-llvm-shared-libs

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

-Emil

> 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
>>