parent
272f6c8277
commit
2898f32458
|
@ -29,49 +29,6 @@ in {
|
|||
null;
|
||||
});
|
||||
|
||||
llvmPackages = self.recurseIntoAttrs self.llvmPackages_8;
|
||||
|
||||
llvmPackages_8 = super.llvmPackages_8 // {
|
||||
|
||||
llvm = super.llvmPackages_8.llvm.overrideAttrs
|
||||
(attrs: { patches = [ ./llvm.patch ]; });
|
||||
|
||||
compiler-rt = super.llvmPackages_8.compiler-rt.overrideAttrs
|
||||
(attrs: { patches = attrs.patches ++ [ ./compiler-rt.patch ]; });
|
||||
|
||||
libcxxabi = (super.llvmPackages_8.libcxxabi.override {
|
||||
enableShared = false;
|
||||
}).overrideAttrs (attrs: {
|
||||
postUnpack = attrs.postUnpack + ''
|
||||
patch -p1 -d $(ls -d llvm-*) -i ${./llvm-genode.patch}
|
||||
'';
|
||||
cmakeFlags = attrs.cmakeFlags ++ (lib.optionals hasGenode [
|
||||
"-DCMAKE_C_FLAGS=-nodefaultlibs"
|
||||
"-DLIBCXXABI_USE_LLVM_UNWINDER=OFF"
|
||||
"-DLIBCXXABI_ENABLE_THREADS=OFF"
|
||||
"-DLIBCXXABI_BAREMETAL=ON"
|
||||
]);
|
||||
|
||||
installPhase = attrs.installPhase
|
||||
+ "install -m 644 ../include/*.h $out/include";
|
||||
});
|
||||
|
||||
libcxx = (super.llvmPackages_8.libcxx.override {
|
||||
enableShared = false;
|
||||
}).overrideAttrs (attrs: {
|
||||
patches = attrs.patches ++ (lib.optional hasGenode ./libc++.patch);
|
||||
nativeBuildInputs = attrs.nativeBuildInputs
|
||||
++ [ super.buildPackages.python ];
|
||||
cmakeFlags = attrs.cmakeFlags
|
||||
++ (lib.optional hasGenode "-DLIBCXX_ENABLE_THREADS=OFF");
|
||||
});
|
||||
|
||||
clang-unwrapped = super.llvmPackages_8.clang-unwrapped.overrideAttrs
|
||||
(attrs: {
|
||||
patches = attrs.patches ++ [ ./clang.patch ];
|
||||
});
|
||||
};
|
||||
|
||||
genodeHeaders = self.callPackage ./headers { };
|
||||
|
||||
inherit genodelibc;
|
||||
|
|
|
@ -7,7 +7,9 @@ nixpkgs.stdenv.mkDerivation {
|
|||
outputs = [ "out" "dev" ];
|
||||
version = "19.07";
|
||||
|
||||
LIBCXXABI = nixpkgs.libcxxabi;
|
||||
LIBCXX = nixpkgs.llvmPackages.libcxx;
|
||||
LIBCXXABI = nixpkgs.llvmPackages.libcxxabi;
|
||||
LIBUNWIND = nixpkgs.llvmPackages.libunwind;
|
||||
HOST_LIBC = nixpkgs.buildPackages.glibc.dev;
|
||||
|
||||
src = nixpkgs.fetchgit
|
||||
|
|
Loading…
Reference in New Issue