fix GNU_HOST_NAME for non-linux machines

[openwrt-10.03/.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index 89adb3efc26dbcfc020544569f7c9f5bb51968e6..768b4805595624487068621601ea7f56886c70a6 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -33,15 +33,19 @@ STAMP_DIR:=$(BUILD_DIR)/stamp
 TARGET_DIR:=$(BUILD_DIR)/root
 IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg
 
-REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc
-GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
-KERNEL_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
-TARGET_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
+ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
+  REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc
+  GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
+  TARGET_CROSS:=$(OPTIMIZE_FOR_CPU)-linux-uclibc-
+endif
+
 IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
 
-TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
+TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)
 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
 
+export PATH:=$(TARGET_PATH)
+
 LINUX_DIR:=$(BUILD_DIR)/linux
 LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
 
@@ -54,8 +58,9 @@ SED:=$(STAGING_DIR)/bin/sed -i -e
 CP:=cp -fpR
 
 ifneq ($(CONFIG_CCACHE),)
-  export CCACHE_DIR:=$(TOPDIR)/ccache_$(ARCH)
-  TARGET_CC:=ccache $(TARGET_CC)
+  # FIXME: move this variable to a better location
+  export CCACHE_DIR=$(TOPDIR)/ccache_$(ARCH)
+  TARGET_CC:= ccache $(TARGET_CC)
 endif
 
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
@@ -71,12 +76,11 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
        -e 's/i[3-9]86/i386/' \
        )
 
-GNU_HOST_NAME:=$(HOST_ARCH)-pc-linux-gnu
+GNU_HOST_NAME:=$(shell $(HOSTCC) -dumpmachine)
 
 TARGET_CONFIGURE_OPTS:= \
-  PATH=$(TARGET_PATH) \
   AR=$(TARGET_CROSS)ar \
-  AS=$(TARGET_CROSS)as \
+  AS="$(TARGET_CC) -c $(TARGET_CFLAGS)" \
   LD=$(TARGET_CROSS)ld \
   NM=$(TARGET_CROSS)nm \
   CC="$(TARGET_CC)" \
@@ -89,7 +93,6 @@ TARGET_CONFIGURE_OPTS:= \
 RSTRIP:= \
   STRIP="$(STRIP)" \
   STRIP_KMOD="$(TARGET_CROSS)strip --strip-unneeded --remove-section=.comment" \
-  PATH=$(TARGET_PATH) \
   $(SCRIPT_DIR)/rstrip.sh
 
 # where to build (and put) .ipk packages
@@ -102,7 +105,7 @@ IPKG:= \
 
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
-  PATH="$(TARGET_PATH)" ipkg-build -c -o root -g root
+  ipkg-build -c -o root -g root
 
 ifeq ($(CONFIG_ENABLE_LOCALE),true)
   DISABLE_NLS:=