always build sed, some systems have a broken one where it's hard to detect

[openwrt.git] / toolchain / uClibc / Makefile

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 1499573..7329112 100644 (file)
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/target.mk
 


@@ -9,7 +15,7 @@ PKG_SOURCE_URL:=http://www.uclibc.org/downloads
 PKG_MD5SUM:=1ada58d919a82561061e4741fb6abd29
 PKG_CAT:=bzcat
 
 PKG_MD5SUM:=1ada58d919a82561061e4741fb6abd29
 PKG_CAT:=bzcat
 

-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(TOOLCHAIN_BUILD_DIR)/uClibc-$(PKG_VERSION)

 
 include $(INCLUDE_DIR)/host-build.mk
 
 
 include $(INCLUDE_DIR)/host-build.mk
 


@@ -46,13 +52,13 @@ endif
 ifeq ($(CONFIG_SOFT_FLOAT),y)
        $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(PKG_BUILD_DIR)/.config
 endif
 ifeq ($(CONFIG_SOFT_FLOAT),y)
        $(SED) 's,.*HAS_FPU.*,HAS_FPU=n\nUCLIBC_HAS_FLOATS=y\nUCLIBC_HAS_SOFT_FLOAT=y,g' $(PKG_BUILD_DIR)/.config
 endif

-       mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include
-       mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib
-       mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
+       mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/include
+       mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/lib
+       mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/lib
+       PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \
+               PREFIX=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \

                DEVEL_PREFIX=/usr/ \
                DEVEL_PREFIX=/usr/ \

-               RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \
+               RUNTIME_PREFIX=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \

                HOSTCC="$(HOSTCC)" \
                CPU_CFLAGS="$(TARGET_CFLAGS)" \
                pregen install_dev;
                HOSTCC="$(HOSTCC)" \
                CPU_CFLAGS="$(TARGET_CFLAGS)" \
                pregen install_dev;


@@ -62,7 +68,7 @@ define Build/Configure
 endef
 
 define Build/Compile
 endef
 
 define Build/Compile

-       $(MAKE) -C $(PKG_BUILD_DIR) \
+       PATH=$(TARGET_PATH) $(MAKE) -C $(PKG_BUILD_DIR) \

                PREFIX= \
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \
                PREFIX= \
                DEVEL_PREFIX=/ \
                RUNTIME_PREFIX=/ \


@@ -86,7 +92,7 @@ define Build/Install
 endef
 
 define Build/Clean
 endef
 
 define Build/Clean

-       rm -rf $(PKG_BUILD_DIR) $(TOOL_BUILD_DIR)/uClibc_dev
+       rm -rf $(PKG_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)/uClibc_dev

 endef
 
 $(eval $(call HostBuild))
 endef
 
 $(eval $(call HostBuild))