diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 20:29:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-31 20:29:57 +0100 |
| commit | ebad1f5ce74dfa9dead8d84c4d91051c68dc4e33 (patch) | |
| tree | cf9b95b067187741e1096f3dbe1d259af446c38a | |
| parent | 8f219fb9f03a068a7d9e26f43affefa0b1c4b836 (diff) | |
| parent | 0fe87f4777f55868974f30aa2449520da326fe8e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/build.mk | 2 | ||||
| -rwxr-xr-x | scripts/update-sys | 2 | ||||
| -rw-r--r-- | target/config/Config.in | 11 | ||||
| -rw-r--r-- | target/config/Config.in.arch.choice | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk index f5451b5b8..d526906ed 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -288,6 +288,8 @@ $(CONFIG)/gconf: @$(MAKE) -C $(CONFIG) gconf defconfig: .menu $(CONFIG)/conf + @${BASH} ${TOPDIR}/scripts/update-sys + @${BASH} ${TOPDIR}/scripts/update-pkg ifeq (${OStype},Linux) @echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig endif diff --git a/scripts/update-sys b/scripts/update-sys index bbbfcdbf8..e6a72bd77 100755 --- a/scripts/update-sys +++ b/scripts/update-sys @@ -19,6 +19,8 @@ check_native() { fi } +touch $topdir/target/config/Config.in.native + for i in $(ls $topdir/target/);do if [ -d "$topdir/target/$i/sys-enabled" ];then cat $topdir/target/$i/sys-enabled/* > $topdir/target/$i/Config.in.systems 2>/dev/null diff --git a/target/config/Config.in b/target/config/Config.in index 11fd58224..42e891cba 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -204,7 +204,8 @@ config ADK_TARGET_LIB_UCLIBC !ADK_TARGET_SYSTEM_LEMOTE_YEELONG && \ !ADK_LINUX_SPARC64 && \ !ADK_LINUX_SPARC && \ - !ADK_LINUX_PPC64 + !ADK_LINUX_PPC64 && \ + !ADK_LINUX_NATIVE help http://uclibc.org @@ -213,7 +214,6 @@ config ADK_TARGET_LIB_EGLIBC boolean select ADK_eglibc depends on \ - ADK_LINUX_NATIVE || \ ADK_LINUX_ARM || \ ADK_LINUX_ARMEB || \ ADK_LINUX_MIPS || \ @@ -234,7 +234,6 @@ config ADK_TARGET_LIB_GLIBC boolean select ADK_glibc depends on \ - ADK_LINUX_NATIVE || \ ADK_LINUX_ARM || \ ADK_LINUX_ARMEB || \ ADK_LINUX_MIPS || \ @@ -250,6 +249,12 @@ config ADK_TARGET_LIB_GLIBC help http://www.gnu.org/libc +config ADK_TARGET_LIB_LIBC + prompt "Native C library" + boolean + select ADK_libc + depends on ADK_LINUX_NATIVE + endchoice config ADK_TARGET_SUFFIX diff --git a/target/config/Config.in.arch.choice b/target/config/Config.in.arch.choice index 4b5292d88..607fbb4b9 100644 --- a/target/config/Config.in.arch.choice +++ b/target/config/Config.in.arch.choice @@ -6,9 +6,9 @@ config ADK_CHOOSE_TARGET_ARCH config ADK_LINUX_NATIVE bool "native build" - select ADK_libc select ADK_native select ADK_NATIVE + select ADK_TARGET_LIB_LIBC depends on ADK_HOST_LINUX help Make a native build. Use host tools. |