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/dri-i915 | |
| 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/dri-i915')
| -rw-r--r-- | src/gallium/targets/dri-i915/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am index c9988e3d1a3..d51144da3b7 100644 --- a/src/gallium/targets/dri-i915/Makefile.am +++ b/src/gallium/targets/dri-i915/Makefile.am @@ -33,6 +33,7 @@ AM_CPPFLAGS = \ dridir = $(DRI_DRIVER_INSTALL_DIR) dri_LTLIBRARIES = i915_dri.la +nodist_EXTRA_i915_dri_la_SOURCES = dummy.cpp i915_dri_la_SOURCES = target.c i915_dri_la_LDFLAGS = $(GALLIUM_DRI_LINKER_FLAGS) @@ -52,8 +53,6 @@ i915_dri_la_LIBADD = \ $(GALLIUM_DRI_LIB_DEPS) \ $(INTEL_LIBS) -nodist_EXTRA_i915_dri_la_SOURCES = dummy.cpp - if HAVE_MESA_LLVM AM_CPPFLAGS += -DGALLIUM_LLVMPIPE i915_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la |