diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-03-11 15:24:07 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-03-31 12:26:47 +0100 |
| commit | 0484b8446a02a4b77d5a1dab89f6e0b8af831027 (patch) | |
| tree | 044c399c8d86c9e59e138785a2b4a2646064d879 /src/gallium/targets/libgl-xlib | |
| parent | 2d9c33009a62b704e64b49b87ed1cee9c8dcb12b (diff) | |
| download | external_mesa3d-0484b8446a02a4b77d5a1dab89f6e0b8af831027.zip external_mesa3d-0484b8446a02a4b77d5a1dab89f6e0b8af831027.tar.gz external_mesa3d-0484b8446a02a4b77d5a1dab89f6e0b8af831027.tar.bz2 | |
gallium/targets: explicitly include a dummy.cpp and remove all the LINK mayhem
Explicitly setting the linker variable was required for old and broken
build toolchains. At this point this should no longer be needed, and
setting the sources lists will trigger generation of the correct LINK
variables.
Explicitly include dummy.cpp to use g++ to link the static library which
in most cases is based upon C++ code.
v2: Reword commit message.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/gallium/targets/libgl-xlib')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/Makefile.am | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am index 7e84ffe..cc382db 100644 --- a/src/gallium/targets/libgl-xlib/Makefile.am +++ b/src/gallium/targets/libgl-xlib/Makefile.am @@ -42,6 +42,7 @@ AM_CFLAGS = $(X11_INCLUDES) lib_LTLIBRARIES = libGL.la +nodist_EXTRA_libGL_la_SOURCES = dummy.cpp libGL_la_SOURCES = xlib.c libGL_la_LDFLAGS = -version-number $(GL_MAJOR):$(GL_MINOR):$(GL_TINY) -no-undefined @@ -59,17 +60,9 @@ libGL_la_LIBADD = \ $(CLOCK_LIB) if HAVE_MESA_LLVM -libGL_la_LINK = $(CXXLINK) $(libGL_la_LDFLAGS) -# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable -nodist_EXTRA_libGL_la_SOURCES = dummy-cpp.cpp - libGL_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) AM_CPPFLAGS += -DGALLIUM_LLVMPIPE libGL_la_LDFLAGS += $(LLVM_LDFLAGS) -else -libGL_la_LINK = $(CXXLINK) $(libGL_la_LDFLAGS) -# Mention a dummy pure C file to trigger generation of the $(LINK) variable -nodist_EXTRA_libGL_la_SOURCES = dummy-c.c endif include $(top_srcdir)/install-gallium-links.mk |