aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-07-25 10:32:38 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-07-25 10:32:38 +0000
commit5820306407040480272527ceba969ecbc14f35af (patch)
tree3a51492bf92cbe6b90d66ace9969a33a4aaf8c68
parent1266eb49eede1f1bb1f5bab230b0a1f9ee22408a (diff)
downloadupstream-5820306407040480272527ceba969ecbc14f35af.tar.gz
upstream-5820306407040480272527ceba969ecbc14f35af.tar.bz2
upstream-5820306407040480272527ceba969ecbc14f35af.zip
only export GCC_HONOUR_COPTS for the built-in toolchain, fixes missing-fhonour-copts warnings with external toolchains
SVN-Revision: 27771
-rw-r--r--include/kernel.mk4
-rw-r--r--rules.mk2
2 files changed, 4 insertions, 2 deletions
diff --git a/include/kernel.mk b/include/kernel.mk
index a2dce091e9..020779fd63 100644
--- 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 874066e378..af6cf53261 100644
--- 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