diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 12:48:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 12:48:01 +0100 |
| commit | 3fe732e577313be28abbb99a636779a9debe400c (patch) | |
| tree | d37f3e105c10037db1cc82596462c85e0902ad12 /package/busybox | |
| parent | 0e8c55d0649610a3848bac209ac5054701869e52 (diff) | |
| parent | 5101b72fac2c9a6971a0c7d2fe6bbd318e9678ab (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/busybox')
| -rw-r--r-- | package/busybox/Makefile | 6 | ||||
| -rw-r--r-- | package/busybox/config/shell/Config.in | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/package/busybox/Makefile b/package/busybox/Makefile index d4184a37a..1fe63ff0a 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -36,12 +36,8 @@ 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' \ -C ${WRKBUILD} -ifneq (${ADK_NATIVE},y) -BB_MAKE_FLAGS+= CROSS_COMPILE="$(TARGET_CROSS)" EXTRA_LDFLAGS='-static-libgcc' -else -BB_MAKE_FLAGS+= EXTRA_LDFLAGS="-static-libgcc" -endif do-configure: # get all symbols from top level config diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in index 52a96c7e2..488041e22 100644 --- a/package/busybox/config/shell/Config.in +++ b/package/busybox/config/shell/Config.in @@ -8,7 +8,7 @@ menu "Shells" config BUSYBOX_ASH bool "ash" - default y + default n depends on !BUSYBOX_NOMMU help Tha 'ash' shell adds about 60k in the default configuration and is |