Merge branch 'bh/cross-debug' (#2030)

* bh/cross-debug:
  build: add support for releasing cross-compiled debug binaries

Signed-off-by: Jared Tobin <jared@tlon.io>
This commit is contained in:
Jared Tobin 2019-12-06 21:19:20 +08:00
commit 9d02b5e88e
No known key found for this signature in database
GPG Key ID: 0E4647D58F8A69E4

View File

@ -19,9 +19,13 @@ let
ge-additions = env: ge-additions = env:
import ./pkgs/ge-additions/cross.nix env; import ./pkgs/ge-additions/cross.nix env;
urbit = env: urbit = { env, debug }:
import ./pkgs/urbit/release.nix env import ./pkgs/urbit/release.nix env {
{ ent = ent env; ge-additions = ge-additions env; debug = false; name = "urbit"; }; inherit debug;
name = if debug then "urbit-debug" else "urbit";
ent = ent env;
ge-additions = ge-additions env;
};
builds-for-platform = plat: builds-for-platform = plat:
plat.deps // { plat.deps // {
@ -29,7 +33,8 @@ let
inherit (plat.env) cmake_toolchain; inherit (plat.env) cmake_toolchain;
ent = ent plat; ent = ent plat;
ge-additions = ge-additions plat; ge-additions = ge-additions plat;
urbit = urbit plat; urbit = urbit { env = plat; debug = false; };
urbit-debug = urbit { env = plat; debug = true; };
}; };
darwin_extra = { darwin_extra = {