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

OCaml: fix configure flags for flambda support

Browse Source 
The configure program for OCaml has been using a new set of command-line
arguments from version 4.08. This is a small refactoring to ease dealing with
the two sets.
This commit is contained in:
Vincent Laporte 2019-11-23 07:19:42 +00:00 committed by Vincent Laporte
parent 1491611bde
commit 9b76c5e17a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/ocaml/generic.nix
View File

@ -41,11 +41,15 @@ stdenv.mkDerivation (args // {
}; };
prefixKey = "-prefix "; prefixKey = "-prefix ";
configureFlags = optionals useX11 ( configureFlags =
if stdenv.lib.versionAtLeast version "4.08" let flags = new: old:
then [ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"] if stdenv.lib.versionAtLeast version "4.08"
else [ "-x11lib" x11lib "-x11include" x11inc ]) then new else old
++ optional flambdaSupport "-flambda" ; in
optionals useX11 (flags
[ "--x-libraries=${x11lib}" "--x-includes=${x11inc}"]
[ "-x11lib" x11lib "-x11include" x11inc ])
++ optional flambdaSupport (flags "--enable-flambda" "-flambda")
; ;
buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";