mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-15 02:03:01 +00:00
31 lines
1022 B
Diff
31 lines
1022 B
Diff
|
---
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -964,7 +964,7 @@ ${UTILLIB21}: ${UTILLIB21_OBJS} ${FWLIB2
|
||
|
|
# Link tests for external repos
|
||
|
|
${BUILD}/host/linktest/extern: ${HOSTLIB}
|
||
|
|
${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB}
|
||
|
|
-${BUILD}/host/linktest/extern: LDLIBS += -static
|
||
|
|
+#${BUILD}/host/linktest/extern: LDLIBS += -static
|
||
|
|
TEST_OBJS += ${BUILD}/host/linktest/extern.o
|
||
|
|
|
||
|
|
.PHONY: hostlib
|
||
|
|
@@ -1056,7 +1056,7 @@ ${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTIL
|
||
|
|
${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB}
|
||
|
|
|
||
|
|
# Utilities for auto-update toolkits must be statically linked.
|
||
|
|
-${UTIL_BINS_STATIC}: LDFLAGS += -static
|
||
|
|
+${UTIL_BINS_STATIC}:
|
||
|
|
|
||
|
|
|
||
|
|
.PHONY: utils
|
||
|
|
@@ -1089,7 +1089,7 @@ futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
|
||
|
|
|
||
|
|
${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
|
||
|
|
@${PRINTF} " LD $(subst ${BUILD}/,,$@)\n"
|
||
|
|
- ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} -static $^ ${LDLIBS}
|
||
|
|
+ ${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
|
||
|
|
|
||
|
|
${FUTIL_BIN}: LDLIBS += ${CRYPTO_LIBS}
|
||
|
|
${FUTIL_BIN}: ${FUTIL_OBJS} ${UTILLIB}
|