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
@@ -76,8 +76,8 @@ let
|
||||
"-nostdinc"
|
||||
"-nostdinc++"
|
||||
"-isystem" "${lib.getDev stdenv.cc.libc}/include"
|
||||
"-I" "${unwrapped}/include"
|
||||
"-I" "${unwrapped}/lib/clang/5.0.2/include"
|
||||
"-I" "${lib.getDev unwrapped}/include"
|
||||
"-I" "${lib.getLib unwrapped}/lib/clang/5.0.2/include"
|
||||
];
|
||||
|
||||
# Autodetect the include paths for the compiler used to build Cling, in the same way Cling does at
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper,
|
||||
llvm, gmp, mpfr, readline, bison, flex }:
|
||||
libllvm, gmp, mpfr, readline, bison, flex }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
baseName="pure";
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ bison flex ];
|
||||
propagatedBuildInputs = [ llvm gmp mpfr readline ];
|
||||
propagatedBuildInputs = [ libllvm gmp mpfr readline ];
|
||||
NIX_LDFLAGS = "-lLLVMJIT";
|
||||
|
||||
postPatch = ''
|
||||
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
|
||||
configureFlags = [ "--enable-release" ];
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${llvm}/lib make check
|
||||
LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libllvm}/lib make check
|
||||
'';
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/pure --prefix LD_LIBRARY_PATH : ${llvm}/lib
|
||||
wrapProgram $out/bin/pure --prefix LD_LIBRARY_PATH : ${libllvm}/lib
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
|
||||
"--with-system-zlib"
|
||||
"--with-system-icu"
|
||||
|
||||
"--with-libclang-path=${llvmPackages.libclang}/lib"
|
||||
"--with-libclang-path=${llvmPackages.libclang.lib}/lib"
|
||||
"--with-clang-path=${llvmPackages.clang}/bin/clang"
|
||||
|
||||
"--enable-shared-js"
|
||||
|
||||
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
|
||||
"--features" "test-cranelift,test-jit"
|
||||
];
|
||||
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
meta = with lib; {
|
||||
description = "The Universal WebAssembly Runtime";
|
||||
|
||||
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [ python cmake clang ];
|
||||
buildInputs = [ llvmPackages.libclang ] ++
|
||||
lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
|
||||
LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user