From patchwork Fri Feb 4 16:47:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5071 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 4Jr1h21pqgz3wsl for ; Fri, 4 Feb 2022 16:48:34 +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 4Jr1gT4Psjz5S2; 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 4Jr1gR5L4Nz32Ms; 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 4Jr1gN1TX1z32MV for ; Fri, 4 Feb 2022 16:48:00 +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 4Jr1gM0s9Nz80; Fri, 4 Feb 2022 16:47:59 +0000 (UTC) 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=TppYgWzg2MIl2WIatj1s8WlcKywXV5OY3XbTYKoB9dQ=; b=Ox13dmS1sULsiKBdsIQoYFKrDPYgOmxDpdgyTcZqEp4jQ446z0FFJ2+iTNQeb+1oX/hbLY +hVJleH6zSlWw8Aw== 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=TppYgWzg2MIl2WIatj1s8WlcKywXV5OY3XbTYKoB9dQ=; b=i7w2m8HQxMJ3Q4OsO06LCvvl+wxyLJQsjFBEh//u01xitlWJWYeGfwW3oJNeCJm5YAiJ57 AgM42zBetPDU2f8u1QxtNnd/+XC6IK2HF49mhzoe5bGBXZpZoPwbjuLGCC/60MburX5n/s aB3y2bC9RCgUbtg9aT1kN6oVQtPdySahaR4duUbJ72TzkwIPtIDsKbcUufSQotwwQAyGIR mOzX8+bQKfciM5GXSRjcFFN5Z92P58Nq5htjCsy24B0/DS5pA0eLNCz10uqeFFQbis9gd8 et+WoV1l6FLWLhDaJnyf9qAm3D1cejDyWADxpyJNCrMIlb07KAQQGMCi2FvBKA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 24/28] make.sh: Set correct PATH in stage1 Date: Fri, 4 Feb 2022 16:47:44 +0000 Message-Id: <20220204164748.315559-24-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" We did not use any of the tools that we were building which made the build fail when cross-building on a different architecture. Signed-off-by: Michael Tremer --- make.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/make.sh b/make.sh index f59624665..3c7bc1011 100755 --- a/make.sh +++ b/make.sh @@ -663,8 +663,11 @@ lfsmake1() { lfsmakecommoncheck $* [ $? == 1 ] && return 0 + # Set PATH to use the toolchain tools first and then whatever the host has set + local PATH="${TOOLS_DIR}/ccache/bin:${TOOLS_DIR}/sbin:${TOOLS_DIR}/bin:${PATH}" + if [ -n "${CUSTOM_PATH}" ]; then - local PATH="${CUSTOM_PATH}:${PATH}" + PATH="${CUSTOM_PATH}:${PATH}" fi cd $BASEDIR/lfs && env -i \