diff options
| author | sterni <sternenseemann@systemli.org> | 2022-01-27T11·42+0100 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2022-01-28T10·43+0000 |
| commit | 6908d960b24072043923adcd6ecc0aa128496187 (patch) | |
| tree | bef57de5351f9de85f9c7d005664b4394eefcc16 /nix | |
| parent | 1673fe95c8e0187844b3607e02e37963cb79dba2 (diff) | |
feat(3p/overlays/ecl-static): 21.2.1 -> 1c98924 r/3692
Seems like some issues to do with bytecode compilation have been fixed at HEAD. closer-mop compiles again and an ironclad failure with the next quicklisp/channel bump is avoided. In this change pathname handling in ECL also changed somehow, causing it to make the :directory part absolute by prefixing it with a slash which made ld.bfd unhappy while linking an output path that began with a double slash. This problem can be avoided by constructing the path as ANSI Common Lisp intended. The truename on the out path is important to make it recognize that it is indeed a directory. Change-Id: I5e744022b92502f99ac0b33411a6be443707e200 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5076 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/buildLisp/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix index 442ac7dfe1..ab23b30210 100644 --- a/nix/buildLisp/default.nix +++ b/nix/buildLisp/default.nix @@ -413,10 +413,9 @@ let (ext:install-c-compiler) (c:build-program - (make-pathname :name "${name}" - :directory (concatenate 'string - (getenv-or-fail "out") - "/bin")) + (merge-pathnames (make-pathname :directory '(:relative "bin") + :name "${name}") + (truename (getenv-or-fail "out"))) :epilogue-code `(progn ;; UIOP doesn't understand ECL, so we need to make it ;; aware that we are a proper executable, causing it |