From patchwork Tue Aug 18 10:59:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 508258 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42AE814032B for ; Tue, 18 Aug 2015 21:02:01 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 8961D28BC8B; Tue, 18 Aug 2015 13:00:54 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 5D13E28063C for ; Tue, 18 Aug 2015 13:00:41 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mout.web.de (mout.web.de [212.227.17.11]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Tue, 18 Aug 2015 13:00:40 +0200 (CEST) Received: from tenchi-htpc.lan ([91.64.206.38]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0M41Bm-1YaW3j2BNK-00rb7z for ; Tue, 18 Aug 2015 13:01:25 +0200 From: Dirk Neukirchen To: openwrt-devel@lists.openwrt.org Date: Tue, 18 Aug 2015 12:59:41 +0200 Message-Id: <1439895581-6203-1-git-send-email-dirkneukirchen@web.de> X-Mailer: git-send-email 2.5.0 X-Provags-ID: V03:K0:EPUkmY+DO2/B+MAu5agabPqOi2OutFIGHIT3H9a5ONA9DfqimA9 fwzjstGNEwBGTmC983CswVwfsGhzsK4/+aKUotAXalEwWbZ4cCbGdkS7QOOiYrqAtvt0ADx P8g9U2se/V5hpnOlbQEwHpphsWAXXMc19nqb6O68syYADswX136enFAy7UeQRlJZKZql3SX Dok1BoYNorjuRBzWV9FVw== X-UI-Out-Filterresults: notjunk:1; V01:K0:P8QJP2q9abc=:nQTP/iOMdnbBPgL464FAKj rChaesifv27hHQYmuVMOJV7q+VqRj6wQfFKBSNk6HmmLX62vin4rl/4BBjCdSbtUWgvrOkQBI sgXyDsDeDaUKKYlvEaIIrhrgF/3zZig5YExUYWD2Ie6nNklJtxiT19VAfxvNpInZscnG166Bp KYtQ2OaGIOEUlMoPsTO/p9AdtSUqt7QH1s+sVsGvNOHrDyDCCIyRdLqlwUNkDy62R4o2cyTkd O72oHDUHEjUhXAD57Y+EfSzEuG0Y4JsAc3oBULBKV3eG6z8yx1tSy/05P5zZR8htxK9RzfJGX ws1yglVv1vmR4Y84/+Gnx0PfWRtOpu/DuM3+to1ktGoYlBaGyhRjrxp9RfgFWXMqpIdD3SOJy Xwtz1NICMUJ57FtM/J8XlT/5fmaxuBtYFZhsqBWLp6kgyhgSQb/XA+Q/Kht6ZpIuZSWhCLREn kjCEJ2QCDWPn9ru+ZyDx0VZVQ8Y8VnlE+73XEyZLvMrgoWaWSBYqkuUp+K25ScI/xfklR/lyd efXvAzQns+INOFs0/zTJP0e9MgQVsxKlpeldoiUN9sQSzv6u9sbHqH65lQftplgO9Zgwix+Vj rafsJUgcFH1fiYAAVDRdRKE8wb/61U+++H5tTrLMuemNwW+9ZAuHfgtrn4Q+gu8fJdW2Jpdts PfFyEuwQUVH2UCi/KXxTtboKvkrFD6pWUICXKx8ivJQzi6lwqhYSYoRkMiSq7TBPoRmVObvVN XyfGgZw8226i+Ueq Subject: [OpenWrt-Devel] [PATCH] rules.mk : remove GCC 4.4 and GCC 4.5 conditional X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" gcc 4.4 was removed in r44957 gcc: remove 4.4.7 (only used by avr32) gcc 4.5 was removed in r36149 Signed-off-by: Dirk Neukirchen --- rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules.mk b/rules.mk index 58b9f3e..819bea5 100644 --- a/rules.mk +++ b/rules.mk @@ -143,7 +143,7 @@ ifndef DUMP -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 $(if $(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_5),,-Wno-error=unused-but-set-variable) + TARGET_CFLAGS+= -fhonour-copts -Wno-error=unused-but-set-variable TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/usr/include ifeq ($(CONFIG_USE_MUSL),y) TARGET_CPPFLAGS+= -I$(TOOLCHAIN_DIR)/include/fortify @@ -201,7 +201,7 @@ HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS) HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib -ifeq ($(CONFIG_GCC_VERSION_4_4)$(CONFIG_GCC_VERSION_4_6)$(CONFIG_EXTERNAL_TOOLCHAIN),) +ifeq ($(CONFIG_GCC_VERSION_4_6)$(CONFIG_EXTERNAL_TOOLCHAIN),) TARGET_AR:=$(TARGET_CROSS)gcc-ar TARGET_RANLIB:=$(TARGET_CROSS)gcc-ranlib TARGET_NM:=$(TARGET_CROSS)gcc-nm