1---
2--- a/Makefile
3+++ b/Makefile
4@@ -964,7 +964,7 @@ ${UTILLIB21}: ${UTILLIB21_OBJS} ${FWLIB2
5 # Link tests for external repos
6 ${BUILD}/host/linktest/extern: ${HOSTLIB}
7 ${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB}
8-${BUILD}/host/linktest/extern: LDLIBS += -static
9+#${BUILD}/host/linktest/extern: LDLIBS += -static
10 TEST_OBJS += ${BUILD}/host/linktest/extern.o
11
12 .PHONY: hostlib
13@@ -1056,7 +1056,7 @@ ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTIL
14 ${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB}
15
16 # Utilities for auto-update toolkits must be statically linked.
17-${UTIL_BINS_STATIC}: LDFLAGS += -static
18+${UTIL_BINS_STATIC}:
19
20
21 .PHONY: utils
22@@ -1089,7 +1089,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
23
24 ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
25 @${PRINTF} " LD $(subst ${BUILD}/,,$@)\n"
26- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS}
27+ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
28
29 ${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS}
30 ${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB}