diff options
author | Danny Milosavljevic <dannym@scratchpost.org> | 2021-02-11 19:12:36 +0100 |
---|---|---|
committer | Danny Milosavljevic <dannym@scratchpost.org> | 2021-02-11 19:12:36 +0100 |
commit | abd318ff4b741eac11227778bf2e569ee7b186ff (patch) | |
tree | 6abc09a3e01914d891124e9d0dda0f4e0979c485 /gnu/packages/aux-files/guile-launcher.c | |
parent | 71cb6dfe10540718eb337e7e2248fc809394894b (diff) | |
parent | c5dc87fee840ad620b01637dc4f9ffa5efc9270c (diff) | |
download | guix-patches-abd318ff4b741eac11227778bf2e569ee7b186ff.tar guix-patches-abd318ff4b741eac11227778bf2e569ee7b186ff.tar.gz |
Merge branch 'master' into core-updates
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 */ } |