summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-25 10:32:38 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-07-25 10:32:38 +0000
commitaeb70915fb9ad48527d584f6a8c27ec132fea7d9 (patch)
treededee9a874f9f555e87861c1680e51b45376d477
parent65ff2ee6a475b57d02b4475d11167a7f6891eb41 (diff)
only export GCC_HONOUR_COPTS for the built-in toolchain, fixes missing-fhonour-copts warnings with external toolchains
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27771 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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 a2dce091e..020779fd6 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 874066e37..af6cf5326 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