From 37ca4a9ebf394633976669a4684ef78cfd5f9894 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 8 Sep 2014 09:06:40 +0200
Subject: avoid duplicate uclibc.config, fix sed command for HAVE_SHARED

---
 toolchain/uclibc/Makefile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'toolchain/uclibc/Makefile')

diff --git a/toolchain/uclibc/Makefile b/toolchain/uclibc/Makefile
index 66efa465f..760bbdebe 100644
--- a/toolchain/uclibc/Makefile
+++ b/toolchain/uclibc/Makefile
@@ -17,13 +17,8 @@ endif
 
 $(WRKBUILD)/.headers:
 	$(SED) 's,^CROSS_COMPILE=.*,CROSS_COMPILE=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak
-ifeq ($(ADK_TARGET_UCLINUX),y)
-	PATH='$(HOST_PATH)' sed -e 's
^KERNEL_HEADERS.*$$
KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"
' \
-	    $(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/uclibc-nommu.config >${WRKBUILD}/.config
-else
 	PATH='$(HOST_PATH)' sed -e 's
^KERNEL_HEADERS.*$$
KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"
' \
 	    $(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/uclibc.config >${WRKBUILD}/.config
-endif
 ifeq ($(ADK_TARGET_ENDIAN),little)
 	$(SED) 's/.*\(ARCH_LITTLE_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(ARCH_WANTS_LITTLE_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config
@@ -35,8 +30,8 @@ else
 	$(SED) 's/.*\(ARCH_LITTLE_ENDIAN\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(ARCH_WANTS_LITTLE_ENDIAN\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-ifneq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),)
-	$(SED) 's/.*\(HAVE_SHARED\).*/#\1=y/' ${WRKBUILD}/.config
+ifeq ($(ADK_TARGET_USE_STATIC_LIBS)$(ADK_TARGET_BINFMT_FLAT),)
+	$(SED) 's/.*\(HAVE_SHARED\).*/\1=y/' ${WRKBUILD}/.config
 else
 	$(SED) 's/.*\(HAVE_SHARED\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-- 
cgit v1.2.3