[Mesa-dev] [PATCH] Ensure we find the linker scripts in out-of-tree builds.

[Kai Wasserbäch]

Signed-off-by: Kai Wasserbäch <kai at dev.carbon-project.org>
Cc: thomas.stellard at amd.com
---
Hi Tom,
the patches you sent seem to work, but only for in-tree builds. If you push
them out, please also fold the following patch into that series, that ensures
out-of-tree builds work as well.

If ran a full out-of-tree build in a clean pbuilder build environment; didn't
run-test the resulting binaries yet.

Kind regards,
Kai Wasserbäch

P.S.: Just for your reference: this is a follow-up to the discussion on IRC
yesterday.


 src/gallium/targets/egl-static/Makefile.am  | 2 +-
 src/gallium/targets/pipe-loader/Makefile.am | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index e7fc11b..760c477 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -30,7 +30,7 @@
 #
 include $(top_srcdir)/src/gallium/Automake.inc
 
-LDFLAGS+=-Wl,egl.link
+LDFLAGS += -Wl,$(top_srcdir)/src/gallium/targets/egl-static/egl.link
 
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
index 8e2002c..970ff0e 100644
--- a/src/gallium/targets/pipe-loader/Makefile.am
+++ b/src/gallium/targets/pipe-loader/Makefile.am
@@ -22,7 +22,7 @@
 
 include $(top_srcdir)/src/gallium/Automake.inc
 
-LDFLAGS+=-Wl,pipe.link
+LDFLAGS += -Wl,$(top_srcdir)/src/gallium/targets/pipe-loader/pipe.link
 
 AM_CPPFLAGS = \
 	$(GALLIUM_CFLAGS) \
-- 
1.8.4.rc3