about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-05-31T15·11+0200
committerclbot <clbot@tvl.fyi>2022-06-01T10·46+0000
commit3c5da97609a6fc2ac2ac86afda54ac1b2dba36f3 (patch)
tree2a13f439ddd63c11f41fdc2b1d0e3a8d8b5add9f
parent89f3f0a5dc710c891a422d530c18a58aa2d336fb (diff)
fix(nix/buildLisp): resolve eval problem in ccl code r/4200
The isPowerPC predicate has been [removed], since it was misleadingly
named (it just matches PowerPC, 32bit, little endian). This means the
64bit code path could now actually work.

Not sure about endianess, the CCL docs don't really say much regarding
that topic.

[removed]: https://github.com/NixOS/nixpkgs/pull/168113

Change-Id: Icf4a8c6b1df95fa597ed87508f57aaa73e6185ed
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5796
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
-rw-r--r--nix/buildLisp/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix
index d9f9e70a37..9d6ce4edda 100644
--- a/nix/buildLisp/default.nix
+++ b/nix/buildLisp/default.nix
@@ -515,8 +515,8 @@ let
       # See https://ccl.clozure.com/docs/ccl.html#building-definitions
       faslExt =
         /**/
-        if targetPlatform.isPowerPC && targetPlatform.is32bit then "pfsl"
-        else if targetPlatform.isPowerPC && targetPlatform.is64bit then "p64fsl"
+        if targetPlatform.isPower && targetPlatform.is32bit then "pfsl"
+        else if targetPlatform.isPower && targetPlatform.is64bit then "p64fsl"
         else if targetPlatform.isx86_64 && targetPlatform.isLinux then "lx64fsl"
         else if targetPlatform.isx86_32 && targetPlatform.isLinux then "lx32fsl"
         else if targetPlatform.isAarch32 && targetPlatform.isLinux then "lafsl"