aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-10 21:00:47 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-10 21:00:47 +0000
commitbef327c78d40d6a900a55f99fdd9a70767b9a28d (patch)
tree79a2f859df1f6eef15defd02bd2f453735ed327e /Makefile
parentb87e1b04bb502a91072a6c5adf6fd6b0481d7a95 (diff)
downloadbusybox-w32-bef327c78d40d6a900a55f99fdd9a70767b9a28d.tar.gz
busybox-w32-bef327c78d40d6a900a55f99fdd9a70767b9a28d.tar.bz2
busybox-w32-bef327c78d40d6a900a55f99fdd9a70767b9a28d.zip
fixes from Vladimir Dronnikov <dronnikov@gmail.ru>
git-svn-id: svn://busybox.net/trunk/busybox@16358 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c1103cf95..5117c4550 100644
--- a/Makefile
+++ b/Makefile
@@ -563,9 +563,17 @@ busybox-all := $(core-y) $(libs-y)
563# Rule to link busybox - also used during CONFIG_KALLSYMS 563# Rule to link busybox - also used during CONFIG_KALLSYMS
564# May be overridden by arch/$(ARCH)/Makefile 564# May be overridden by arch/$(ARCH)/Makefile
565quiet_cmd_busybox__ ?= LINK $@ 565quiet_cmd_busybox__ ?= LINK $@
566ifdef CONFIG_STATIC
567 cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) \
568 -static \
569 -o $@ \
570 -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
571 -Wl,--start-group $(busybox-all) -Wl,--end-group
572else
566 cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) -o $@ \ 573 cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) -o $@ \
567 -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \ 574 -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \
568 -Wl,--start-group $(busybox-all) -Wl,--end-group \ 575 -Wl,--start-group $(busybox-all) -Wl,--end-group
576endif
569 577
570# Generate System.map 578# Generate System.map
571quiet_cmd_sysmap = SYSMAP 579quiet_cmd_sysmap = SYSMAP