ocaml: native code building for ARM on 3.12 and 4.00

I think it already works. I'll test more throughly tomorrow.
This commit is contained in:
Lluis Batlle 2012-09-23 23:56:48 +02:00
parent be20063772
commit 839f124ba1
3 changed files with 4 additions and 4 deletions

View file

@ -2,7 +2,7 @@
let
useX11 = !stdenv.isArm && !stdenv.isMips;
useNativeCompilers = !stdenv.isArm && !stdenv.isMips;
useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString;
in

View file

@ -2,7 +2,7 @@
let
useX11 = !stdenv.isArm && !stdenv.isMips;
useNativeCompilers = !stdenv.isArm && !stdenv.isMips;
useNativeCompilers = !stdenv.isMips;
inherit (stdenv.lib) optionals optionalString;
in

View file

@ -1066,8 +1066,6 @@ let
mktemp = callPackage ../tools/security/mktemp { };
mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
modemmanager = callPackage ../tools/networking/modemmanager {};
monit = builderDefsPackage ../tools/system/monit {
@ -2484,6 +2482,8 @@ let
menhir = callPackage ../development/ocaml-modules/menhir { };
mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
ocaml_batteries = callPackage ../development/ocaml-modules/batteries {
camomile = camomile_0_8_2;
};