diff options
| -rw-r--r-- | mk/build.mk | 42 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 3 |
2 files changed, 23 insertions, 22 deletions
diff --git a/mk/build.mk b/mk/build.mk index 8a5128439..4d2f5c693 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -320,27 +320,6 @@ $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) defconfig: .menu $(CONFIG)/conf -ifeq (${OStype},Linux) - @echo ADK_HOST_LINUX=y > $(ADK_TOPDIR)/.defconfig -endif -ifeq (${OStype},FreeBSD) - @echo ADK_HOST_FREEBSD=y > $(ADK_TOPDIR)/.defconfig -endif -ifeq (${OStype},MirBSD) - @echo ADK_HOST_MIRBSD=y > $(ADK_TOPDIR)/.defconfig -endif -ifeq (${OStype},OpenBSD) - @echo ADK_HOST_OPENBSD=y > $(ADK_TOPDIR)/.defconfig -endif -ifeq (${OStype},NetBSD) - @echo ADK_HOST_NETBSD=y > $(ADK_TOPDIR)/.defconfig -endif -ifeq (${OStype},Darwin) - @echo ADK_HOST_DARWIN=y > $(ADK_TOPDIR)/.defconfig -endif -ifneq (,$(filter CYGWIN%,${OStype})) - @echo ADK_HOST_CYGWIN=y > $(ADK_TOPDIR)/.defconfig -endif @if [ ! -z "$(ADK_LIBC_GIT)" ];then \ if [ "$(ADK_TARGET_LIBC)" = "glibc" ];then \ echo "ADK_TARGET_LIB_GLIBC_GIT=y" >> $(ADK_TOPDIR)/.defconfig; \ @@ -466,6 +445,27 @@ endif @if [ ! -z "$(ADK_APPLIANCE)" ];then \ $(CONFIG)/conf --defconfig=.defconfig $(CONFIG_CONFIG_IN); \ fi +ifeq (${OStype},Linux) + @echo ADK_HOST_LINUX=y >> $(ADK_TOPDIR)/.config +endif +ifeq (${OStype},FreeBSD) + @echo ADK_HOST_FREEBSD=y >> $(ADK_TOPDIR)/.config +endif +ifeq (${OStype},MirBSD) + @echo ADK_HOST_MIRBSD=y >> $(ADK_TOPDIR)/.config +endif +ifeq (${OStype},OpenBSD) + @echo ADK_HOST_OPENBSD=y >> $(ADK_TOPDIR)/.config +endif +ifeq (${OStype},NetBSD) + @echo ADK_HOST_NETBSD=y >> $(ADK_TOPDIR)/.config +endif +ifeq (${OStype},Darwin) + @echo ADK_HOST_DARWIN=y >> $(ADK_TOPDIR)/.config +endif +ifneq (,$(filter CYGWIN%,${OStype})) + @echo ADK_HOST_CYGWIN=y >> $(ADK_TOPDIR)/.config +endif allconfig: ifeq (${OStype},Linux) diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 858e57ea3..1a34e94a6 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -209,7 +209,8 @@ config ADK_HOST_BUILD_PCRE config ADK_HOST_BUILD_KMOD bool - default y + default y if ADK_HOST_LINUX + default n source "target/config/Config.in.prereq" |