From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([209.51.188.92]:56351)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hPwDQ-0008FG-4Z
	for guix-patches@gnu.org; Sun, 12 May 2019 17:41:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hPwDP-00056w-5T
	for guix-patches@gnu.org; Sun, 12 May 2019 17:41:04 -0400
Received: from debbugs.gnu.org ([209.51.188.43]:58226)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1hPwDN-00051V-RK
	for guix-patches@gnu.org; Sun, 12 May 2019 17:41:03 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1hPwDN-00077t-KA
	for guix-patches@gnu.org; Sun, 12 May 2019 17:41:01 -0400
Subject: [bug#35611] [PATCH 1/2] gnu: cross-base: Allow using non-default
	glibc.
Resent-Message-ID: <handler.35611.B35611.155769723527354@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <lIPG7Aip1kvx4dmDzDQOSQ8OGS0G9_f3COv4CgIvX_FKd56k9096gjgd2FrXPGXcO4scp8HrRHMpEipnDtjOGI0MwCep2Vi3r-utcOX2eG8=@carldong.me>
Date: Sun, 12 May 2019 23:40:23 +0200
In-Reply-To: <lIPG7Aip1kvx4dmDzDQOSQ8OGS0G9_f3COv4CgIvX_FKd56k9096gjgd2FrXPGXcO4scp8HrRHMpEipnDtjOGI0MwCep2Vi3r-utcOX2eG8=@carldong.me>
	(Carl Dong's message of "Mon, 06 May 2019 22:21:43 +0000")
Message-ID: <87woivs660.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Carl Dong <accounts@carldong.me>
Cc: 35611@debbugs.gnu.org

Hi Carl,

Carl Dong <accounts@carldong.me> skribis:

> * gnu/packages/cross-base.scm (cross-libc, native-libc, cross-newlib?):
>   Add xlibc optional argument to specify using a non-default glibc
>   package.

[...]

>  (define* (cross-libc target
>                       #:optional
> +                     (xlibc glibc)
>                       (xgcc (cross-gcc target))
>                       (xbinutils (cross-binutils target))
>                       (xheaders (cross-kernel-headers target)))
> -  "Return a libc cross-built for TARGET, a GNU triplet.  Use XGCC and
> -XBINUTILS and the cross tool chain."
> -  (if (cross-newlib? target)
> -      (native-libc target)
> -      (let ((libc glibc))
> +  "Return XLIBC cross-built for TARGET, a GNU triplet. Use XGCC and XBIN=
UTILS
> +and the cross tool chain."

Really a detail, but for clarity I would change =E2=80=9Cxlibc=E2=80=9D to =
=E2=80=9Clibc=E2=80=9D,
because this argument denotes a C library, not a cross-compiled C
library.

Ditto in other places.

You can send an updated patch or I can make this change on your behalf
if you prefer, let me know!

> -(define (native-libc target)
> +(define* (native-libc target
> +                     #:optional
> +                     (xlibc glibc))
>    (if (target-mingw? target)
>        mingw-w64
> -      glibc))
> +      xlibc))

This procedure is starting to look weird.  :-)  I wonder if we should
inline it at the call sites, but we can look into it later.

Thanks,
Ludo=E2=80=99.