summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-08-06 14:53:43 +0100
committerRoss Burton <ross.burton@intel.com>2019-08-06 14:55:50 +0100
commitedc7680ed5a03cedb5facf14693823455e12c29c (patch)
tree91cb7904a609d40ba5a2c883aff4fc6d8adf70b1
parentf111bf3ac091a3a6d1f094172621d9d033c3833c (diff)
src/util/Makefile: explicitly reset LINK to not use libtool
Simply looking at libtool redefines LINK globally to use libtool, which when you're trying to cross-compile to Windows can cause complications. As in src/util/ we're simply building a small binary for the build host, reset LINK to the automake default so that the traditional compile/link steps occur without libtool. Also remove -all-static from LDFLAGS as that is a libtool-specific argument intended to solve this problem. Closes: #100 Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--src/util/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 37314370..b7236530 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -7,10 +7,11 @@ AM_CFLAGS = \
AM_CPPFLAGS = \
-I$(top_srcdir)/include
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
CC = @CC_FOR_BUILD@
CPPFLAGS = @CPPFLAGS_FOR_BUILD@
CFLAGS = @CFLAGS_FOR_BUILD@
-LDFLAGS = @LDFLAGS_FOR_BUILD@ -all-static
+LDFLAGS = @LDFLAGS_FOR_BUILD@
LIBS =
EXEEXT = @EXEEXT_FOR_BUILD@