public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sbcl: better thread support and arm detection

This commit is contained in:
Tomas Hlavaty 2016-04-04 22:16:21 +02:00
parent 08cf0dcb5c
commit f6807dba60
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/sbcl/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, writeText, sbclBootstrap { stdenv, fetchurl, writeText, sbclBootstrap
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
# Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die. # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
# Note that the created binaries still need `patchelf --set-interpreter ...` # Note that the created binaries still need `patchelf --set-interpreter ...`
# to get rid of ${glibc} dependency. # to get rid of ${glibc} dependency.
@ -23,10 +24,11 @@ stdenv.mkDerivation rec {
(pushnew x features)) (pushnew x features))
(disable (x) (disable (x)
(setf features (remove x features)))) (setf features (remove x features))))
#-arm ''
(enable :sb-thread) + stdenv.lib.optionalString threadSupport "(enable :sb-thread)"
#+arm + stdenv.lib.optionalString stdenv.isArm "(enable :arm)"
(enable :arm))) " > customize-target-features.lisp + ''
)) " > customize-target-features.lisp
pwd pwd