diff mbox series

[bug#36477,v4,18/23] gexp: Use cross extensions when cross-compiling.

Message ID 20191002095904.6325-19-m.othacehe@gmail.com
State Accepted
Headers show
Series System cross-compilation | expand

Commit Message

Mathieu Othacehe Oct. 2, 2019, 9:58 a.m. UTC 
---
 guix/gexp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Mathieu Othacehe Oct. 2, 2019, 2:47 p.m. UTC | #1 
I forget the commit message. It would be:

* guix/gexp.scm (load-path-expression): Use ungexp-splicing instead of
ungexp-native-splicing
so that the cross modules are used when target is set.

Mathieu

Le mer. 2 oct. 2019 à 11:59, Mathieu Othacehe <m.othacehe@gmail.com> a écrit :
>
> ---
>  guix/gexp.scm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/guix/gexp.scm b/guix/gexp.scm
> index d9bdde2e42..514422cb08 100644
> --- a/guix/gexp.scm
> +++ b/guix/gexp.scm
> @@ -1513,7 +1513,7 @@ are searched for in PATH.  Return #f when MODULES and EXTENSIONS are empty."
>                                                 (string-append extension
>                                                                "/share/guile/site/"
>                                                                (effective-version)))
> -                                             '((ungexp-native-splicing extensions)))
> +                                             '((ungexp-splicing extensions)))
>                                          %load-path)))
>                          (set! %load-compiled-path
>                            (cons (ungexp compiled)
> @@ -1522,7 +1522,7 @@ are searched for in PATH.  Return #f when MODULES and EXTENSIONS are empty."
>                                                                "/lib/guile/"
>                                                                (effective-version)
>                                                                "/site-ccache"))
> -                                             '((ungexp-native-splicing extensions)))
> +                                             '((ungexp-splicing extensions)))
>                                          %load-compiled-path)))))))))
>
>  (define* (gexp->script name exp
> --
> 2.23.0
>
Ludovic Courtès Oct. 11, 2019, 10:21 a.m. UTC | #2 
Hi Mathieu,

Mathieu Othacehe <m.othacehe@gmail.com> skribis:

> I forget the commit message. It would be:
>
> * guix/gexp.scm (load-path-expression): Use ungexp-splicing instead of
> ungexp-native-splicing
> so that the cross modules are used when target is set.

This one LGTM because ‘load-path-expression’ is used in ‘gexp->file’ and
‘gexp->script’, where, indeed, we want to use the target extensions (and
target modules too!).

Please push to ‘master’ (I don’t think it triggers a full rebuild, but
I’d suggest double-checking anyway :-)).

Thanks!

Ludo’.
Ludovic Courtès Oct. 11, 2019, 10:22 a.m. UTC | #3 
Hi Mathieu,

Mathieu Othacehe <m.othacehe@gmail.com> skribis:

> I forget the commit message. It would be:
>
> * guix/gexp.scm (load-path-expression): Use ungexp-splicing instead of
> ungexp-native-splicing
> so that the cross modules are used when target is set.

This one LGTM because ‘load-path-expression’ is used in ‘gexp->file’ and
‘gexp->script’, where, indeed, we want to use the target extensions (and
target modules too!).

Please push to ‘master’ (I don’t think it triggers a full rebuild, but
I’d suggest double-checking anyway :-)).

Thanks!

Ludo’.
Mathieu Othacehe Oct. 14, 2019, 8 a.m. UTC | #4 
Hey Ludo,

> Please push to ‘master’ (I don’t think it triggers a full rebuild, but
> I’d suggest double-checking anyway :-)).

Pushed to master, thanks for the review :)

Mathieu
diff mbox series

Patch

diff --git a/guix/gexp.scm b/guix/gexp.scm
index d9bdde2e42..514422cb08 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1513,7 +1513,7 @@  are searched for in PATH.  Return #f when MODULES and EXTENSIONS are empty."
                                                (string-append extension
                                                               "/share/guile/site/"
                                                               (effective-version)))
-                                             '((ungexp-native-splicing extensions)))
+                                             '((ungexp-splicing extensions)))
                                         %load-path)))
                         (set! %load-compiled-path
                           (cons (ungexp compiled)
@@ -1522,7 +1522,7 @@  are searched for in PATH.  Return #f when MODULES and EXTENSIONS are empty."
                                                               "/lib/guile/"
                                                               (effective-version)
                                                               "/site-ccache"))
-                                             '((ungexp-native-splicing extensions)))
+                                             '((ungexp-splicing extensions)))
                                         %load-compiled-path)))))))))
 
 (define* (gexp->script name exp