From patchwork Fri Sep 13 11:42:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67923 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 38EAE27BBEC; Fri, 13 Sep 2024 12:43:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8B9EA27BBE2 for ; Fri, 13 Sep 2024 12:43:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sp4hW-0003kX-EI; Fri, 13 Sep 2024 07:42:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sp4hS-0003j1-Bb for guix-patches@gnu.org; Fri, 13 Sep 2024 07:42:54 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sp4hS-0005Ok-1R for guix-patches@gnu.org; Fri, 13 Sep 2024 07:42:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=qA4hs0GthMdQ1Un2d95javi0kmnE+aYlZjcfQSkbXlU=; b=T1nE3XTPPoQKwQRNy5DD0PbOAb4AhMxTkn57HOFNQK0ZFktkbp6P53BWm0lW7ZYXQ5Bb8qiFyE3CPkn2/0T+gNy+KXMgtGykNbUCA/mI4Lf8Iy/sij1vt/aaSKmDPA3W19Uw9SabsEi0wa2zgoAZ+Sdc1SiWlPSLaAa1j/fmmNGrrY4IoeJgpaMA+4lk/zm4m7pzF4KMgi5X8ZJkIoqcmW0/LmdYQwIEn+1QYDa7tBA59pFyl0nH2eVXdhARvwfCx0nlNL5d00UuLof3/2HRjUeUqd3AC+aRh8uM0V2RQEMGZgbZXeY5+eMg9AiQ6rWBg4wcWG6M0iiJAEqbOSuKsg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sp4hb-0008Hq-2H for guix-patches@gnu.org; Fri, 13 Sep 2024 07:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73118] [PATCH v2 2/5] gnu: make-libstdc++-arm-none-eabi: output libstdc++ to arm-none-eabi. Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 13 Sep 2024 11:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73118@debbugs.gnu.org Cc: Rutherther Received: via spool by 73118-submit@debbugs.gnu.org id=B73118.172622774831737 (code B ref 73118); Fri, 13 Sep 2024 11:43:03 +0000 Received: (at 73118) by debbugs.gnu.org; 13 Sep 2024 11:42:28 +0000 Received: from localhost ([127.0.0.1]:42612 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp4h2-0008Fm-24 for submit@debbugs.gnu.org; Fri, 13 Sep 2024 07:42:28 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:26743) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sp4h0-0008FY-38 for 73118@debbugs.gnu.org; Fri, 13 Sep 2024 07:42:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1726227731; x=1726486931; bh=qA4hs0GthMdQ1Un2d95javi0kmnE+aYlZjcfQSkbXlU=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=Aa1sH7chLN476jvs3NTAnripyrTOLV3jXvKUnpuyd7EvP8sBDTobw4sf6Tpu/2OAq uCRMMom1OAwYsR0aAO/AAed8bodDXgcf3rDDC6PIpPnee03AfaPcdzTlegIkz1J4dM e4r8HY9bm8A2VlxpI1+SDehkJ4ST0ts8ljeJtubkFVG6krVj3lVmQFh0o7MIdwWUfN 5pxaUlp/lFJ/jBH5omV+yshcKVrA0HxhtAAZ3zqHn86PndipT9nHIG8MQLjeivMjYp sVWGPrUucwn8B8emhKkvDMIe4BVnivUJDnGgH++QvVIlq1IGKxAsHvQwaZppB9L09v nar89AWLeswIA== Date: Fri, 13 Sep 2024 11:42:04 +0000 Message-ID: <9db92cc94fd199a5b640a30a1e62c5e2b023df66.1726227323.git.rutherther@protonmail.com> In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 46a5523f9054c562a077edd9655659aec9950321 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The libstdc++ made for arm-none-eabi puts the contents into "lib" folder, but that's unexpected when the resulting toolchain is a cross toolchain. The folder should be "arm-none-eabi/lib", that's the path added to CROSS_C_LIBRARY_PATH * gnu/packages/embedded.scm (make-libstdc++-arm-none-eabi): [arguments]<#:configure-flags>: Point --libdir to arm-none-eabi/lib. [arguments]<#:strip-directories>: Set to arm-none-eabi/lib. Change-Id: Ia8b867a1c6ebeedeae9564e0a6a1e0401b35bd5b --- gnu/packages/embedded.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index a7ba9ebe98..2a482f7e52 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -493,9 +493,14 @@ (define make-libstdc++-arm-none-eabi "--disable-tls" "--disable-plugin" "--with-newlib" + ,(string-append "--libdir=" + (assoc-ref %outputs "out") + "/arm-none-eabi/lib") ,(string-append "--with-gxx-include-dir=" (assoc-ref %outputs "out") - "/arm-none-eabi/include/c++"))))) + "/arm-none-eabi/include/c++"))) + ((#:strip-directories _ #f) + ''("arm-none-eabi/lib")))) (native-inputs `(("newlib" ,newlib) ("xgcc" ,xgcc)