only export GCC_HONOUR_COPTS for the built-in toolchain, fixes missing-fhonour-copts...

SVN-Revision: 27771

diff --git a/include/kernel.mk b/include/kernel.mk
index a2dce091e98f48bfa2ee11ca8e7393e7e6b8c350..020779fd6320b3b66d0a76b65b4a53e30c52f111 100644 (file)
--- a/include/kernel.mk
+++ b/include/kernel.mk
@@ -14,7 +14,9 @@ ifeq ($(DUMP),1)
   BOARD?=<BOARD>
   LINUX_VERSION?=<LINUX_VERSION>
 else
-  export GCC_HONOUR_COPTS=s
+  ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+    export GCC_HONOUR_COPTS=s
+  endif
 
   LINUX_KMOD_SUFFIX=ko
 

diff --git a/rules.mk b/rules.mk
index 874066e3785ffabce2f19543c3ecc9ce842cb88d..af6cf53261bea0bf0cd5a0d981b880f426fef1ad 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -124,6 +124,7 @@ LIBRPC_DEPENDS=+USE_UCLIBC:librpc
 ifndef DUMP
   ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
     -include $(TOOLCHAIN_DIR)/info.mk
+    export GCC_HONOUR_COPTS:=0
     TARGET_CROSS:=$(if $(TARGET_CROSS),$(TARGET_CROSS),$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))-)
     TARGET_CFLAGS+= -fhonour-copts
     TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/usr/include -I$(TOOLCHAIN_DIR)/include
@@ -160,7 +161,6 @@ endif
 
 export PATH:=$(TARGET_PATH)
 export STAGING_DIR
-export GCC_HONOUR_COPTS:=0
 export SH_FUNC:=. $(INCLUDE_DIR)/shell.sh;
 
 PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config