From patchwork Sat Oct 26 08:45:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1184581 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="H7EeJbL7"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 470ZMf0MT9z9sPf for ; Sat, 26 Oct 2019 19:46:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 33DB585B12; Sat, 26 Oct 2019 08:46:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KHaqFloFYnUd; Sat, 26 Oct 2019 08:46:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8BD6385A96; Sat, 26 Oct 2019 08:46:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 95DC91BF47D for ; Sat, 26 Oct 2019 08:46:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8F59A85A96 for ; Sat, 26 Oct 2019 08:46:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9iKEqvAkMioV for ; Sat, 26 Oct 2019 08:46:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E155E85951 for ; Sat, 26 Oct 2019 08:46:09 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id p21so4547129wmg.2 for ; Sat, 26 Oct 2019 01:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=edLd7iRzMoxKIjKhIYlxU1UGZXa6t9/gFrx/+kOO5II=; b=H7EeJbL70mWj/9XWANEMXcLub05lfyUA/fLJVhSUj7B+Cplb0ipVOYX/pJADs1iNAh lv1cuD6BrZISk11c3HV12lBx4yw0uiVpiI2d4mp7gvoi1HsURYd1yiQjHEM3+c3ucSOw Iwftq05WyWZQiQEwEV/7kPuNXTGmsLXio48FuOw2m2pyR8BiMu9KmRguA6HYNpNqwKb3 3gXlPOCIcDxFilUBq4ZfiSFogb9tbGFDr9oMBRJzj41L9/uy70Bina91WbXrdoGoEBjl adISbGVtyu7yQj2tKYSUdumSVbFlWktROdA8R4jyleirE+ISCBh1pbi7HthyLtl23wrW USeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=edLd7iRzMoxKIjKhIYlxU1UGZXa6t9/gFrx/+kOO5II=; b=dJbxhMzNcAupGJ9qq5HFfmqgXN49+yAhz3GXl3SahOKaHWOZHGhHdktiL+Rswdb2i4 JoEIofeb10AYmjdQAcej9iEfMSnzbD1bcxTkLmmfONL51w/eTtGqQ1bSgK1ZwRujiY7v B9TADpGuTio7uTPwrdxVyNRJb2UtWc2oV8Jk7RnH4rDndjoChQ4z8uWK87FYzeGpcM7W E+lHePyDvMIeJRf2kbe+v1WRewd5utw0RdNokmE5dB00fgG2Yx/nXghBeSW82AXLOtwq bCiZjhRPXNqqhe3PcpVB6R+WvoOF2f8hohVd49gmCuFoJWnZ8SjM1C3al5CNCkhnSXvy ToDg== X-Gm-Message-State: APjAAAWRi1TczBl47OKOmBAXA0Ss2MWf0HABgQgtbsQ4azvLWFQlWotz JpINctOBBs3Cx8OHZmf0UhHphuVh X-Google-Smtp-Source: APXvYqwJw27D9UmJcrhgt0g1Q8Z//zZs4ncP1X1jusw6ArlLPWSc1YaEQinokAbkBEEIPNKFjgLOKg== X-Received: by 2002:a1c:7d95:: with SMTP id y143mr7346023wmc.143.1572079568209; Sat, 26 Oct 2019 01:46:08 -0700 (PDT) Received: from scaer.lyon.intranet (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id n11sm5098476wmd.26.2019.10.26.01.46.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Oct 2019 01:46:07 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 26 Oct 2019 10:45:58 +0200 Message-Id: <6016a687f8d76f66626d4b28bbf87dd4eab02f91.1572079551.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 6/9] package/gcc: don't override a variable X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Yann E. MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Yann E. MORIN --- package/gcc/gcc-final/gcc-final.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 79c88a5d60..30fb87856c 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -64,18 +64,16 @@ HOST_GCC_FINAL_CONF_OPTS = \ --enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \ --with-build-time-tools=$(HOST_DIR)/$(GNU_TARGET_NAME)/bin -HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib* # The kernel wants to use the -m4-nofpu option to make sure that it # doesn't use floating point operations. ifeq ($(BR2_sh4)$(BR2_sh4eb),y) HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4,m4-nofpu" -# check-package OverriddenVariable HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4* -endif -ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y) +else ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y) HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4a,m4a-nofpu" -# check-package OverriddenVariable HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4* +else +HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib* endif ifeq ($(BR2_GCC_SUPPORTS_LIBCILKRTS),y)