From: Steven Barth <cyrus@openwrt.org>
Date: Mon, 29 Jun 2015 06:47:49 +0000 (+0000)
Subject: toolchain: only use fortify-headers for musl
X-Git-Tag: reboot~2663
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=55fe8b2988612cd587fa8e942b221890a8f40325;p=openwrt%2Fstaging%2Fxback.git

toolchain: only use fortify-headers for musl

Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 46138
---

diff --git a/rules.mk b/rules.mk
index a0a9a5d202..58b9f3eb0b 100644
--- a/rules.mk
+++ b/rules.mk
@@ -144,7 +144,11 @@ ifndef DUMP
     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 $(if $(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5),,-Wno-error=unused-but-set-variable)
-    TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/usr/include -I$(TOOLCHAIN_DIR)/include/fortify -I$(TOOLCHAIN_DIR)/include
+    TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/usr/include
+    ifeq ($(CONFIG_USE_MUSL),y)
+      TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/include/fortify
+    endif
+    TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/include
     TARGET_LDFLAGS+= -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib
     TARGET_PATH:=$(TOOLCHAIN_DIR)/bin:$(TARGET_PATH)
   else