llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.
The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.
Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.
----
Other misc notes, highly incomplete
- lvm-config-native and llvm-config are put in `dev` because they are
tools just for build time.
- Clang no longer has an lld dep. That was introduced in
db29857eb3, but if clang needs help
finding lld when it is used we should just pass it flags / put in the
resource dir. Providing it at build time increases critical path
length for no good reason.
----
A note on `nativeCC`:
`stdenv` takes tools from the previous stage, so:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`
while:
1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
This commit is contained in:
committed by
John Ericson
parent
17a8c9c4bf
commit
7869d16545
@@ -15,7 +15,7 @@ buildDunePackage rec {
|
||||
|
||||
minimumOCamlVersion = "4.02";
|
||||
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
|
||||
|
||||
propagatedBuildInputs = [ ctypes ];
|
||||
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
{ stdenv, lib, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }:
|
||||
{ stdenv, lib, fetchpatch, python, cmake, libllvm, ocaml, findlib, ctypes }:
|
||||
|
||||
let version = lib.getVersion llvm; in
|
||||
let version = lib.getVersion libllvm; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ocaml-llvm";
|
||||
inherit version;
|
||||
|
||||
inherit (llvm) src;
|
||||
inherit (libllvm) src;
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ python ocaml findlib ctypes ];
|
||||
propagatedBuildInputs = [ llvm ];
|
||||
propagatedBuildInputs = [ libllvm ];
|
||||
|
||||
patches = [ (fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch";
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
||||
cmakeFlags = [
|
||||
"-DLLVM_OCAML_OUT_OF_TREE=TRUE"
|
||||
"-DLLVM_OCAML_INSTALL_PATH=${placeholder "out"}/ocaml"
|
||||
"-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${lib.getLib llvm}/lib"
|
||||
"-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=${lib.getLib libllvm}/lib"
|
||||
];
|
||||
|
||||
buildFlags = [ "ocaml_all" ];
|
||||
@@ -34,11 +34,11 @@ stdenv.mkDerivation {
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit llvm;
|
||||
inherit libllvm;
|
||||
};
|
||||
|
||||
meta = {
|
||||
inherit (llvm.meta) license homepage;
|
||||
inherit (libllvm.meta) license homepage;
|
||||
platforms = ocaml.meta.platforms or [];
|
||||
description = "OCaml bindings distributed with LLVM";
|
||||
maintainers = with lib.maintainers; [ vbgl ];
|
||||
|
||||
Reference in New Issue
Block a user