| Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame^] | 1 | Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/lib/libx11/merge_requests/22] |
| 2 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 3 | |
| 4 | From edc7680ed5a03cedb5facf14693823455e12c29c Mon Sep 17 00:00:00 2001 |
| 5 | From: Ross Burton <ross.burton@intel.com> |
| 6 | Date: Tue, 6 Aug 2019 14:53:43 +0100 |
| 7 | Subject: [PATCH libX11] src/util/Makefile: explicitly reset LINK to not use |
| 8 | libtool |
| 9 | |
| 10 | Simply looking at libtool redefines LINK globally to use libtool, which when |
| 11 | you're trying to cross-compile to Windows can cause complications. |
| 12 | |
| 13 | As in src/util/ we're simply building a small binary for the build host, reset |
| 14 | LINK to the automake default so that the traditional compile/link steps occur |
| 15 | without libtool. |
| 16 | |
| 17 | Also remove -all-static from LDFLAGS as that is a libtool-specific argument |
| 18 | intended to solve this problem. |
| 19 | |
| 20 | Closes: #100 |
| 21 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 22 | --- |
| 23 | src/util/Makefile.am | 3 ++- |
| 24 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 25 | |
| 26 | diff --git a/src/util/Makefile.am b/src/util/Makefile.am |
| 27 | index 37314370..b7236530 100644 |
| 28 | --- a/src/util/Makefile.am |
| 29 | +++ b/src/util/Makefile.am |
| 30 | @@ -7,10 +7,11 @@ AM_CFLAGS = \ |
| 31 | AM_CPPFLAGS = \ |
| 32 | -I$(top_srcdir)/include |
| 33 | |
| 34 | +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
| 35 | CC = @CC_FOR_BUILD@ |
| 36 | CPPFLAGS = @CPPFLAGS_FOR_BUILD@ |
| 37 | CFLAGS = @CFLAGS_FOR_BUILD@ |
| 38 | -LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static |
| 39 | +LDFLAGS = @LDFLAGS_FOR_BUILD@ |
| 40 | LIBS = |
| 41 | EXEEXT = @EXEEXT_FOR_BUILD@ |
| 42 | |
| 43 | -- |
| 44 | 2.20.1 |
| 45 | |