summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xscripts/trylink6
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index ddc8b25e6..71ebf8f4a 100644
--- a/Makefile
+++ b/Makefile
@@ -563,7 +563,7 @@ busybox-all := $(core-y) $(libs-y)
# May be overridden by arch/$(ARCH)/Makefile
quiet_cmd_busybox__ ?= LINK $@
cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \
- -o $@ \
+ -o $@ -Wl,-M \
-Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
-Wl,--start-group $(busybox-all) -Wl,--end-group
diff --git a/scripts/trylink b/scripts/trylink
index 3ac249c73..1cd50c6ed 100755
--- a/scripts/trylink
+++ b/scripts/trylink
@@ -6,7 +6,7 @@ try() {
added="$1"
shift
$debug && echo "Trying: $* $added"
- "$@" $added >/dev/null 2>&1 \
+ "$@" $added >busybox.map 2>busybox_ld.err \
&& exit 0
}
@@ -14,5 +14,5 @@ try "" "$@"
try "-lm" "$@"
try "-lcrypt" "$@"
try "-Wl,--start-group -lcrypt -lm -Wl,--end-group" "$@"
-# It failed. Rerun & let people see the error messages
-"$@" $added
+# It failed. Let people see the error messages
+cat busybox_ld.err