From patchwork Fri Feb 4 16:47:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5076 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Jr1h60Snqz3xff for ; Fri, 4 Feb 2022 16:48:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Jr1gT3F5Cz5R1; Fri, 4 Feb 2022 16:48:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Jr1gR4zYDz32Mp; Fri, 4 Feb 2022 16:48:03 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Jr1gM6N0Zz32MV for ; Fri, 4 Feb 2022 16:47:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Jr1gM00TPz1ds; Fri, 4 Feb 2022 16:47:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1643993279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pn3LmIhJ1anLL+LKELHvxO4ByOEUrQGF0l/HEsDa4YM=; b=WQN5GwoA9MjaImCG+LAxo+MO9w2dMmFIYJOY9Bpz8bX+Ysii7rznxsZyNYPq2cBEzLHuUS rp4Ia2DMfd2Zi2CYh+wzETie9lUGdWSpyTs2uTQeKOfYQgcQ3rkD3JAG/jpUQUBB3faBAJ fIagTgJFGVLPwPfCWBbTsFyHphZH94U+1edFr/YFuoAbUccMh167/79T2ySD1mIPDpbVRL YYB4zpTIT3lgcA3wFeY/FrScGveGrGIfsjpNk9mKs9LB5aVAWaIZxfis2duAUmLjZFj28E ski6VhS7w+GOadSd9blJ5ZJINyEq66R3DIpdIUKWIl78AoVM39cv7NOKpQK1cA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1643993279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pn3LmIhJ1anLL+LKELHvxO4ByOEUrQGF0l/HEsDa4YM=; b=4t3KC81RsCDijOzU/p4c61pIeyWeAfKMXotwgTGQiHW3CqMt0qWsWarbkIOB4LntaQiT6r OG55ej4xSLRvbuAA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 23/28] make.sh: Add CUSTOM_PATH option to lfsmake1 Date: Fri, 4 Feb 2022 16:47:43 +0000 Message-Id: <20220204164748.315559-23-michael.tremer@ipfire.org> In-Reply-To: <20220204164748.315559-1-michael.tremer@ipfire.org> References: <20220204164748.315559-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is required so that we use the host's tools to perform the stripping. Signed-off-by: Michael Tremer --- make.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/make.sh b/make.sh index cd7464917..f59624665 100755 --- a/make.sh +++ b/make.sh @@ -663,8 +663,12 @@ lfsmake1() { lfsmakecommoncheck $* [ $? == 1 ] && return 0 + if [ -n "${CUSTOM_PATH}" ]; then + local PATH="${CUSTOM_PATH}:${PATH}" + fi + cd $BASEDIR/lfs && env -i \ - PATH="${TOOLS_DIR}/ccache/bin:${TOOLS_DIR}/sbin:${TOOLS_DIR}/bin:${PATH}" \ + PATH="${PATH}" \ CCACHE_DIR="${CCACHE_DIR}"/${BUILD_ARCH}/${TOOLCHAINVER} \ CCACHE_TEMPDIR="${CCACHE_TEMPDIR}" \ CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ @@ -1062,7 +1066,7 @@ buildtoolchain() { lfsmake1 bison lfsmake1 flex lfsmake1 fake-environ - lfsmake1 strip + CUSTOM_PATH="${PATH}" lfsmake1 strip lfsmake1 cleanup-toolchain }