diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-14 12:11:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-14 12:11:20 +0200 |
| commit | 76ca709e69bf386a9e011fae588fe3f5d09b834c (patch) | |
| tree | 3a632f11b1e5ed827fdf14310a316fa60353c078 | |
| parent | f9ac2c3112cedf7d1f155847825297543205e9e2 (diff) | |
prepare the base system without libgcc even for musl
| -rw-r--r-- | package/busybox/Makefile | 6 | ||||
| -rw-r--r-- | package/cfgfs/Makefile | 3 | ||||
| -rw-r--r-- | package/dropbear/Makefile | 2 | ||||
| -rw-r--r-- | package/musl/Config.in.manual | 1 | ||||
| -rw-r--r-- | target/config/Config.in | 7 |
5 files changed, 1 insertions, 18 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index e95c58045..b9476be3e 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -38,11 +38,7 @@ 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 +BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS="-static-libgcc" else BB_MAKE_FLAGS+= EXTRA_LDFLAGS="-static-libgcc" endif diff --git a/package/cfgfs/Makefile b/package/cfgfs/Makefile index 3e53f845c..159bd229b 100644 --- a/package/cfgfs/Makefile +++ b/package/cfgfs/Makefile @@ -26,10 +26,7 @@ $(eval $(call PKG_template,CFGFS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG CONFIG_STYLE:= manual INSTALL_STYLE:= manual - -ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y) TARGET_LDFLAGS+= -static-libgcc -endif do-install: ${INSTALL_DIR} ${IDIR_CFGFS}/sbin diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index c38977f1d..69eb5ff5d 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -32,9 +32,7 @@ ifeq ($(ADK_STATIC),y) TARGET_LDFLAGS+= -static endif -ifeq ($(ADK_TARGET_LIB_STATIC_LIBGCC),y) TARGET_LDFLAGS+= -static-libgcc -endif BUILD_STYLE:= manual INSTALL_STYLE:= manual CONFIGURE_ARGS+= --disable-pam \ diff --git a/package/musl/Config.in.manual b/package/musl/Config.in.manual index a3881c1e8..19f590e61 100644 --- a/package/musl/Config.in.manual +++ b/package/musl/Config.in.manual @@ -4,7 +4,6 @@ config ADK_PACKAGE_MUSL default y if ADK_TARGET_LIB_MUSL && !ADK_TOOLCHAIN_ONLY default n depends on ADK_TARGET_LIB_MUSL - select ADK_PACKAGE_LIBGCC help Embedded C library. diff --git a/target/config/Config.in b/target/config/Config.in index 3865147a7..84ea8fe68 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -564,9 +564,6 @@ config ADK_musl config ADK_libc boolean -config ADK_TARGET_LIB_STATIC_LIBGCC - boolean - config ADK_TARGET_LIBC string default "uclibc" if ADK_uclibc @@ -584,7 +581,6 @@ config ADK_TARGET_LIB_UCLIBC prompt "uClibc embedded C library" boolean select ADK_uclibc - select ADK_TARGET_LIB_STATIC_LIBGCC depends on \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_PPC64 && \ @@ -597,7 +593,6 @@ config ADK_TARGET_LIB_EGLIBC prompt "Embedded GNU C library" boolean select ADK_eglibc - select ADK_TARGET_LIB_STATIC_LIBGCC depends on \ ADK_LINUX_ARM || \ ADK_LINUX_ARMEB || \ @@ -618,7 +613,6 @@ config ADK_TARGET_LIB_GLIBC prompt "GNU C library" boolean select ADK_glibc - select ADK_TARGET_LIB_STATIC_LIBGCC depends on \ ADK_LINUX_ARM || \ ADK_LINUX_ARMEB || \ @@ -654,7 +648,6 @@ config ADK_TARGET_LIB_LIBC prompt "Native C library" boolean select ADK_libc - select ADK_TARGET_LIB_STATIC_LIBGCC depends on ADK_LINUX_NATIVE endchoice |