diff options
| author | Leo Famulari <leo@famulari.name> | 2021-02-09 15:09:43 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2021-02-09 15:09:43 -0500 |
| commit | 388bd35dd0df2d231bc2cce3746d7d5fd15df23a (patch) | |
| tree | 82e7cc45b8279f83439214c7c79dc7161ffda94d /gnu/packages/aux-files/guile-launcher.c | |
| parent | f1c7c2f697877fcb68b53ea062ff8a88f274a2fe (diff) | |
| parent | d00380b0077b0df2a0b790bb115d07c1533b8863 (diff) | |
| download | guix-patches-388bd35dd0df2d231bc2cce3746d7d5fd15df23a.tar guix-patches-388bd35dd0df2d231bc2cce3746d7d5fd15df23a.tar.gz | |
Merge branch 'master' into staging-next
Diffstat (limited to 'gnu/packages/aux-files/guile-launcher.c')
| -rw-r--r-- | gnu/packages/aux-files/guile-launcher.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/aux-files/guile-launcher.c b/gnu/packages/aux-files/guile-launcher.c index 1dd5d77e66..47ba069de1 100644 --- a/gnu/packages/aux-files/guile-launcher.c +++ b/gnu/packages/aux-files/guile-launcher.c @@ -1,5 +1,5 @@ /* GNU Guix --- Functional package management for GNU - Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020 + Copyright 1996-1997,2000-2001,2006,2008,2011,2013,2018,2020,2021 Free Software Foundation, Inc. Copyright (C) 2020 Ludovic Courtès <ludo@gnu.org> @@ -82,7 +82,11 @@ main (int argc, char **argv) unsetenv ("GUILE_LOAD_PATH"); unsetenv ("GUILE_LOAD_COMPILED_PATH"); - scm_install_gmp_memory_functions = 1; + /* XXX: Do not let GMP allocate via libgc as this can lead to memory + corruption in GnuTLS/Nettle since Nettle also uses GMP: + <https://issues.guix.gnu.org/46330>. */ + scm_install_gmp_memory_functions = 0; + scm_boot_guile (argc, argv, inner_main, 0); return 0; /* never reached */ } |