Re: [PATCH 2/4] gnu: cross-base: Make it aware of non-Linux (ie. Hurd)

[Ludovic Courtès]

Manolis Ragkousis <address@hidden> skribis:

> From aaa968bbe01a57ceadf8d0c46c44e0d75d2f90cd Mon Sep 17 00:00:00 2001
> From: Marek Benc <address@hidden>
> Date: Thu, 5 Feb 2015 17:01:14 +0100
> Subject: [PATCH] gnu: cross-base: Make it aware of non-Linux (ie. Hurd)
>  systems.
>
> * gnu/packages/cross-base.scm (cross-gcc-arguments): Make 'set-cross-path 
> aware of the Hurd.

Please wrap line.

>                         (setenv "CROSS_CPATH"
> -                               (string-append libc "/include:"
> -                                              linux "/include"))
> +                               (string-append libc "/include"
> +                                (if linux
> +                                    (string-append ":" linux "/include") "")
> +                                (if hurd
> +                                    (string-append ":" hurd  "/include"
> +                                                   ":" mach  "/include") 
> "")))

Please align ‘else’ branch with ‘then’ branch:

  (if hurd
      consequent
      alternate)

>                         (setenv "CROSS_LIBRARY_PATH"
> -                               (string-append libc "/lib"))
> +                               (string-append libc "/lib"
> +                                (if hurd-minimal
> +                                    (string-append ":" hurd-minimal "/lib") 
> "")))

Ditto.

As I suggested to Manolis, could you make sure that this doesn’t break
the existing GNU/Linux cross-toolchains?

Namely, could you run:

  guix build -e '(@ (gnu packages cross-base) xgcc-armhf)'

If that passes, OK to push to wip-hurd.

Thank you!

Ludo’.