Mesa (master): drivers/nouveau: mention dummy.cpp to use g++ linker
Emil Velikov
evelikov at kemper.freedesktop.org
Sat Apr 5 13:08:53 UTC 2014
Module: Mesa
Branch: master
Commit: 28a42764423c86656a6fe77917c7044d29adf600
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=28a42764423c86656a6fe77917c7044d29adf600
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date: Tue Apr 1 02:49:58 2014 +0100
drivers/nouveau: mention dummy.cpp to use g++ linker
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>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
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)
More information about the mesa-commit
mailing list