From patchwork Sun Oct 16 11:54:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 682684 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sxfsY6K7Dz9sD6 for ; Sun, 16 Oct 2016 22:55:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=IGEXerC3; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id AB040314F8; Sun, 16 Oct 2016 11:55:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rn4Ear2KBxZs; Sun, 16 Oct 2016 11:55:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id EEDB131549; Sun, 16 Oct 2016 11:54:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D26211C1569 for ; Sun, 16 Oct 2016 11:54:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D21248C342 for ; Sun, 16 Oct 2016 11:54:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zDvn6lcpGd1P for ; Sun, 16 Oct 2016 11:54:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 13B078BCAC for ; Sun, 16 Oct 2016 11:54:35 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id b75so21000765lfg.3 for ; Sun, 16 Oct 2016 04:54:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vFXGTDH8AQl4nQJj6sKbQASEBfpZJp/G+fFuuRpbiJY=; b=IGEXerC33lO3gHN/17CUpe7C3BGP5aHPTM73+KoId36Zf2E5eDzGQZl1dx3shqRREZ bDirDomJ2Rdu3E2iwZIb2I3b/7jeCljKkOkI8N6eeVwu5IY7lLUyhocAfI97Y9JnJzWA qorpxD/56aPOkwO6bjdrwvXSV5ww68hKpr4Wm7A5EmtgAl+qRkUkmzgd2z/71kIg7msf WXrs+ZVviEL6qJzZ2gmUATIKf2sRN2UdSH+WhuB2gCcZA8BAUu4vZgVPWJzWdcUIVnLU cI5Dr0+UaZ5/EQaxwDaEb0vB2p5CtRWIoJlpivyFwiTSkibcPPbZDM1c0kYhYYZyPvy3 wSzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vFXGTDH8AQl4nQJj6sKbQASEBfpZJp/G+fFuuRpbiJY=; b=Mwc6Gjheh5yND+8oj0pLYFgz13uvqVS0t2RQM6u/HWY33xsnHouQ9qLzo6tS4I5CT7 Rp3HfQBtLiG78xwvdweoB0wMyJ4e/MFYoI6Ojxqw9CVkGw/AfdOK+kBir4nSYfepv8zz PEVT9/YjRIp3iU1fDS283OFuJWdbxw3lbMiREpv6AU6Z3UYQ59TIwqclU2JibO3+GiQB z7luEnAJChc/VVI1w7p4ZSnYQTWd+CVvMaT8ccTfsM8hCr/oNPLTguXLhxHTQJJ2MAk/ f/CaJV/OumM3LisIUgS36M4FZKmfp1NqqC9B2el3gmosqIebhcPQKn0rtKylZYR1EOJW hWpg== X-Gm-Message-State: AA6/9Rll2sd5CLyOcnswgLpXGmI76HNxzHbIFl7CstwZn8hBv+fVudQSeR7+vDSm6ULI8A== X-Received: by 10.194.89.104 with SMTP id bn8mr8135349wjb.132.1476618873245; Sun, 16 Oct 2016 04:54:33 -0700 (PDT) Received: from localhost.localdomain ([2001:bf0:c001:30:4a51:b7ff:fed2:2913]) by smtp.gmail.com with ESMTPSA id q8sm41718558wjj.7.2016.10.16.04.54.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Oct 2016 04:54:32 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sun, 16 Oct 2016 13:54:23 +0200 Message-Id: <20161016115423.17881-5-s.martin49@gmail.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161016115423.17881-1-s.martin49@gmail.com> References: <20161016115423.17881-1-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v11 4/4] core: only remove O from MAKEOVERRIDES X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" For no apparent reason, MAKEOVERRIDES is not treated the same way depending on whether O is set or not on the command line: * when O is set on the command line (i.e. out-of-tree build): all variables were stripped away from MAKEOVERRIDES; * when O is not set on the command line (i.e. in-Buildroot-source-tree build): all variables are kept and forwarded to the sub-make call. This change cleans things up by only removing the relevant variables from MAKEOVERRIDES when appropriate (i.e. removing O from MAKEOVERRIDES when O is set on the command line) keeping all other variables as-is in the sub-make call; O is set on the sub-make call anyway. Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Samuel Martin --- changes v9->v10: - new patch --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dcf8552..dc0a6d8 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,9 @@ else # Other packages might also support Linux-style out of tree builds # with the O= syntax (E.G. BusyBox does). As make automatically # forwards command line variable definitions those packages get very -# confused. Fix this by telling make to not do so. -MAKEOVERRIDES := +# confused. Fix this by telling make to not do so, only for O=..., but +# keep all others (such as BR2_EXTERNAL, BR2_DL_DIR, etc). +MAKEOVERRIDES := $(filter-out O=%,$(MAKEOVERRIDES)) # Strangely enough O is still passed to submakes with MAKEOVERRIDES # (with make 3.81 atleast), the only thing that changes is the output # of the origin function (command line -> environment).