From a28d57d1c88bd2cc073c8a1702dfa9732e49a46e Mon Sep 17 00:00:00 2001
From: Sven Bachmann <dev@mcbachmann.de>
Date: Sat, 4 Jun 2011 17:39:21 +0200
Subject: [PATCH] rules.mk: always enable -fhonour-copts

Honour-copts was only enabled for not-external-toolchains. But when
using the OpenWrt toolchain itself externally, this breaked the shared
library build of zlib-1.2.5.

See bug #8786 for more details.

Signed-off-by: Sven Bachmann <dev@mcbachmann.de>
---
 rules.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rules.mk b/rules.mk
index 7be2d61..8f833ec 100644
--- a/rules.mk
+++ b/rules.mk
@@ -108,6 +108,7 @@ BUILD_LOG_DIR:=$(TOPDIR)/logs
 
 TARGET_PATH:=$(STAGING_DIR_HOST)/bin:$(PATH)
 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3)
+TARGET_CFLAGS+= -fhonour-copts
 TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
 TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
 ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
@@ -125,7 +126,6 @@ ifndef DUMP
   ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
     -include $(TOOLCHAIN_DIR)/info.mk
     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
     TARGET_LDFLAGS+= -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib
     TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH)
-- 
1.7.4.1

