From 5820306407040480272527ceba969ecbc14f35af Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 25 Jul 2011 10:32:38 +0000 Subject: [PATCH] only export GCC_HONOUR_COPTS for the built-in toolchain, fixes missing-fhonour-copts warnings with external toolchains SVN-Revision: 27771 --- include/kernel.mk | 4 +++- rules.mk | 2 +- 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?= 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