summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/Makefile9
-rw-r--r--package/busybox/patches/014-disable-static-libgcc.patch12
2 files changed, 6 insertions, 15 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index b62855399..486f26c89 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -35,9 +35,12 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
- HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
- CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc' \
+BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" \
+ ARCH="${ARCH}" \
+ GCC_HONOUR_COPTS=s \
+ HOSTCC="${CC_FOR_BUILD}" \
+ HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
+ CROSS_COMPILE="$(TARGET_CROSS)" \
-C ${WRKBUILD}
do-configure:
diff --git a/package/busybox/patches/014-disable-static-libgcc.patch b/package/busybox/patches/014-disable-static-libgcc.patch
deleted file mode 100644
index 79d6345a7..000000000
--- a/package/busybox/patches/014-disable-static-libgcc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur busybox-1.20.2.orig/Makefile.flags busybox-1.20.2/Makefile.flags
---- busybox-1.20.2.orig/Makefile.flags 2012-06-26 15:35:45.000000000 +0200
-+++ busybox-1.20.2/Makefile.flags 2013-08-13 14:25:53.000000000 +0200
-@@ -50,7 +50,7 @@
- # -fno-guess-branch-probability: prohibit pseudo-random guessing
- # of branch probabilities (hopefully makes bloatcheck more stable):
- CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
--CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,)
-+CFLAGS += $(call cc-option,-funsigned-char,)
- CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,)
-
- # FIXME: These warnings are at least partially to be concerned about and should