summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-03-19 09:13:49 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-03-19 09:13:49 +0100
commit5241a47df751d66cfa7428bcb4c920f9903f1fbe (patch)
tree3da1788ec2c30ceb951ff4f91aa3bf98730978d0
parent910966c0e7582620e1087549b10828f2ace1738f (diff)
parent97089cda799d75fc8515f4e9d78c92cb32432e0e (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--package/busybox/config/Config.in1
-rw-r--r--target/config/Config.in.adk1
2 files changed, 2 insertions, 0 deletions
diff --git a/package/busybox/config/Config.in b/package/busybox/config/Config.in
index 3a5e340ae..40f67caa7 100644
--- a/package/busybox/config/Config.in
+++ b/package/busybox/config/Config.in
@@ -454,6 +454,7 @@ menu 'Build Options'
config BUSYBOX_STATIC
bool "Build BusyBox as a static binary (no shared libs)"
+ default y if ADK_STATIC
default n
help
If you want to build a static BusyBox binary, which does not
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 7544723bf..27b72941e 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -36,6 +36,7 @@ config ADK_DEBUG_STRIP
config ADK_STATIC
bool "Link applications statically by default"
default n
+ select BUSYBOX_STATIC
help
Useful for toolchain only target devices.