diff options
Diffstat (limited to 'overlays')
| -rw-r--r-- | overlays/emacs.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/overlays/emacs.nix b/overlays/emacs.nix index 89a59729b819..e7addc80c354 100644 --- a/overlays/emacs.nix +++ b/overlays/emacs.nix @@ -50,17 +50,20 @@ let # things to get merged into master. (super.lib.optionalString (old ? NATIVE_FULL_AOT) (let backendPath = (super.lib.concatStringsSep " " - (builtins.map (x: ''\"-B${x}\"'') [ + (builtins.map (x: ''\"-B${x}\"'') ([ # Paths necessary so the JIT compiler finds its libraries: "${super.lib.getLib self.libgccjit}/lib" "${super.lib.getLib self.libgccjit}/lib/gcc" "${super.lib.getLib self.stdenv.cc.libc}/lib" + ] ++ super.lib.optionals (self.stdenv.cc?cc.libgcc) [ + "${super.lib.getLib self.stdenv.cc.cc.libgcc}/lib" + ] ++ [ # Executable paths necessary for compilation (ld, as): "${super.lib.getBin self.stdenv.cc.cc}/bin" "${super.lib.getBin self.stdenv.cc.bintools}/bin" "${super.lib.getBin self.stdenv.cc.bintools.bintools}/bin" - ])); + ]))); in '' substituteInPlace lisp/emacs-lisp/comp.el --replace \ "(defcustom comp-libgccjit-reproducer nil" \ |