Attachment 72916 Details for Bug 59282 – targets/dri-r600: Force c++ linker in all cases

[patch] targets/dri-r600: Force c++ linker in all cases

0001-targets-dri-r600-Force-c-linker-in-all-cases.patch (text/plain), 1.23 KB, created by Andreas Boll on 2013-01-12 20:18:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Boll

Created: 2013-01-12 20:18:59 UTC

Size: 1.23 KB

patch

obsolete

>From 75ea2dc906d082362dd4fcfac21d66ae0b58d0af Mon Sep 17 00:00:00 2001
>From: Andreas Boll <andreas.boll.dev@gmail.com>
>Date: Sat, 12 Jan 2013 21:13:23 +0100
>Subject: [PATCH] targets/dri-r600: Force c++ linker in all cases
>
>---
> src/gallium/targets/dri-r600/Makefile.am |   10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
>diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am
>index a3dbcde..ed8475b 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
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 59282: 72916

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.