diff options
| author | Emil Velikov <[email protected]> | 2014-03-11 15:24:07 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-03-31 12:26:47 +0100 |
| commit | 0484b8446a02a4b77d5a1dab89f6e0b8af831027 (patch) | |
| tree | 044c399c8d86c9e59e138785a2b4a2646064d879 /src/gallium/targets/gbm | |
| parent | 2d9c33009a62b704e64b49b87ed1cee9c8dcb12b (diff) | |
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 <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/gallium/targets/gbm')
| -rw-r--r-- | src/gallium/targets/gbm/Makefile.am | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/gallium/targets/gbm/Makefile.am b/src/gallium/targets/gbm/Makefile.am index d5255e94b86..e36d317b069 100644 --- a/src/gallium/targets/gbm/Makefile.am +++ b/src/gallium/targets/gbm/Makefile.am @@ -39,6 +39,7 @@ AM_CFLAGS = \ gbm_LTLIBRARIES = gbm_gallium_drm.la +nodist_EXTRA_gbm_gallium_drm_la_SOURCES = dummy.cpp gbm_gallium_drm_la_SOURCES = gbm.c gbm_gallium_drm_la_LIBADD = \ @@ -64,18 +65,9 @@ endif gbm_gallium_drm_la_LDFLAGS = -no-undefined -avoid-version -module -# FIXME: this shouldn't be needed if HAVE_MESA_LLVM -gbm_gallium_drm_la_LINK = $(CXXLINK) $(gbm_gallium_drm_la_LDFLAGS) -# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable -nodist_EXTRA_gbm_gallium_drm_la_SOURCES = dummy-cpp.cpp - gbm_gallium_drm_la_LIBADD += $(LLVM_LIBS) gbm_gallium_drm_la_LDFLAGS += $(LLVM_LDFLAGS) -else -gbm_gallium_drm_la_LINK = $(CXXLINK) $(gbm_gallium_drm_la_LDFLAGS) -# Mention a dummy pure C file to trigger generation of the $(LINK) variable -nodist_EXTRA_gbm_gallium_drm_la_SOURCES = dummy-c.c endif TESTS = gallium-gbm-symbols-check |