diff options
| author | Andreas Boll <[email protected]> | 2013-01-12 21:13:23 +0100 |
|---|---|---|
| committer | Andreas Boll <[email protected]> | 2013-01-13 12:19:29 +0100 |
| commit | 9da454f295062500ebb868e31eebcd5f753f83ff (patch) | |
| tree | 0d7db577b455661e677a3d58c9c81440eeb56346 | |
| parent | e09a5846cdab01a3bf04ac8c11e352d85b89b4af (diff) | |
targets/dri-r600: Force c++ linker in all cases
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59282
| -rw-r--r-- | src/gallium/targets/dri-r600/Makefile.am | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am index a3dbcde8925..ed8475b6892 100644 --- a/src/gallium/targets/dri-r600/Makefile.am +++ b/src/gallium/targets/dri-r600/Makefile.am @@ -59,17 +59,11 @@ r600_dri_la_LIBADD = \ $(LIBDRM_LIBS) \ $(RADEON_LIBS) -if HAVE_MESA_LLVM -r600_dri_la_LINK = $(CXXLINK) $(r600_dri_la_LDFLAGS) -# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable -nodist_EXTRA_r600_dri_la_SOURCES = dummy-cpp.cpp +nodist_EXTRA_r600_dri_la_SOURCES = dummy.cpp +if HAVE_MESA_LLVM r600_dri_la_LDFLAGS += $(LLVM_LDFLAGS) r600_dri_la_LIBADD += $(LLVM_LIBS) -else -r600_dri_la_LINK = $(LINK) $(r600_dri_la_LDFLAGS) -# Mention a dummy pure C file to trigger generation of the $(LINK) variable -nodist_EXTRA_r600_dri_la_SOURCES = dummy-c.c endif # Provide compatibility with scripts for the old Mesa build system for |