summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-08-14 09:03:48 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-08-14 09:03:48 +0200
commit8d2f8e89c7b4ed479c72000e54bc23621e665699 (patch)
treea9f680f731f439723d161d305a7f4eb3042bedb3 /package/busybox
parent8c716c528bc7a91dc1b065269c23707f8c3cb82f (diff)
musl libc compat updates
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/Makefile4
-rw-r--r--package/busybox/patches/014-disable-static-libgcc.patch12
2 files changed, 16 insertions, 0 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 4a8e8ea68..e95c58045 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -38,8 +38,12 @@ BB_MAKE_FLAGS:= V=1 IPKG_ARCH="${CPU_ARCH}" ARCH="${ARCH}" GCC_HONOUR_COPTS=s \
HOSTCC="${CC_FOR_BUILD}" HOSTCFLAGS="$(CFLAGS_FOR_BUILD)" \
-C ${WRKBUILD}
ifneq (${ADK_NATIVE},y)
+ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),)
BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc'
else
+BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)"
+endif
+else
BB_MAKE_FLAGS+= EXTRA_LDFLAGS="-static-libgcc"
endif
diff --git a/package/busybox/patches/014-disable-static-libgcc.patch b/package/busybox/patches/014-disable-static-libgcc.patch
new file mode 100644
index 000000000..79d6345a7
--- /dev/null
+++ b/package/busybox/patches/014-disable-static-libgcc.patch
@@ -0,0 +1,12 @@
+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