Build only the Genode base repositories with GCC

This commit is contained in:
Emery Hemingway 2020-02-11 16:01:39 +01:00
parent 44544e7a39
commit c0b5ee9f73
3 changed files with 21 additions and 21 deletions

View File

@ -6,8 +6,8 @@ let
src = nixpkgs.fetchgit {
url = "https://git.sr.ht/~ehmry/genode";
rev = "71e1a286e5f87091619ad06d5faefe5818f726f8";
sha256 = "1z8j5l0v9bkp7vl5y7x6xagpv593b8fj0xh91asx4f6lmydw9igq";
rev = "11ff9a1dc524dadd3252777d9be529910e375e66";
sha256 = "1238ashnx40fmc715w1mqiachdw7bkd04zy6d6l1hmn7f0ld535n";
};
inherit (nixpkgs) buildPackages llvmPackages;
@ -127,11 +127,11 @@ let
CC = prefix "cc";
CXX = prefix "c++";
LD = prefix "ld";
OBJCOPY = prefix "objcopy";
OBJDUMP = prefix "objdump";
RANLIB = prefix "ranlib";
READELF = prefix "readelf";
STRIP = prefix "strip";
OBJCOPY = "llvm-objcopy";
OBJDUMP = "llvm-objdump";
RANLIB = "llvm-ranlib";
READELF = "llvm-readelf";
STRIP = "llvm-strip";
PKGCONFIG = "${nixpkgs.buildPackages.pkgconfig}/bin/pkg-config";
IS_LLVM = "";
@ -226,33 +226,37 @@ let
};
buildRepo' = { ... }@args:
buildRepoGcc' = { ... }@args:
let drv = buildRepo ({ env = stdenvGcc; } // args);
in { manifest = mkDhallManifest drv; } // drv;
buildRepoLlvm' = { ... }@args:
let drv = buildRepo ({ env = stdenvLlvm; } // args);
in { manifest = mkDhallManifest drv; } // drv;
drvs = rec {
base = buildRepo' {
base = buildRepoGcc' {
repo = "base";
repoInputs = [ ];
};
base-linux = buildRepo' {
base-linux = buildRepoGcc' {
repo = "base-linux";
repoInputs = [ base ];
};
base-nova = buildRepo' {
base-nova = buildRepoGcc' {
repo = "base-nova";
repoInputs = [ base ];
};
os = buildRepo' {
os = buildRepoLlvm' {
repo = "os";
repoInputs = [ base ];
};
gems = buildRepo' {
gems = buildRepoLlvm' {
repo = "gems";
repoInputs = [ base os ];
};

View File

@ -28,11 +28,9 @@ in λ(args : Args)
}
, rom =
let manifest = env:MANIFEST
in Genode.Boot.toRomPaths
[ { mapKey = "ld.lib.so"
, mapValue = manifest.base-linux.bin.ld-linux.mapValue
}
[ manifest.base-linux.bin.ld
, manifest.base-linux.bin.linux_timer_drv
, manifest.os.bin.init
, manifest.base-linux.bin.core-linux

View File

@ -84,11 +84,9 @@ in λ(boot : Genode.Boot.Type)
}
, rom =
let manifest = env:MANIFEST
in Genode.Boot.toRomPaths
[ Prelude.Map.keyText
"ld.lib.so"
manifest.base-nova.lib.ld-nova.mapValue
[ manifest.base-nova.lib.ld
, manifest.base-nova.bin.nova_timer_drv
, manifest.os.bin.init
, manifest.sotest-producer.bin.sotest-harness