Compare commits
3 commits
main
...
feat/cross
Author | SHA1 | Date | |
---|---|---|---|
Jake Hamilton | 6d0463d37d | ||
Jake Hamilton | 4b36a5a013 | ||
Jake Hamilton | e21778c81b |
|
@ -3,17 +3,18 @@
|
||||||
"lib": {
|
"lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"dirtyRev": "2be3111b2c0911f40b47fe0a1fb22b5f5188cf59-dirty",
|
"lastModified": 1723737980,
|
||||||
"dirtyShortRev": "2be3111-dirty",
|
"narHash": "sha256-1WnFatW5kSuO2jjt62hvSbH84TSYyO+VmvkJ0d5e/ZY=",
|
||||||
"lastModified": 1719251485,
|
"ref": "master",
|
||||||
"narHash": "sha256-63NvfFVeTDITfNu60rmCUlaZtAeZUnvrIaOLSk9ScC8=",
|
"rev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13",
|
||||||
|
"revCount": 82,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../?dir=lib"
|
"url": "file:../"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../?dir=lib"
|
"url": "file:../"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
|
|
@ -8,33 +8,35 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "foundation",
|
"dir": "foundation",
|
||||||
"dirtyRev": "3f9d287065ac685ce500c2cddb35428b2927f5a2-dirty",
|
"lastModified": 1724190751,
|
||||||
"dirtyShortRev": "3f9d287-dirty",
|
"narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=",
|
||||||
"lastModified": 1720514984,
|
"ref": "master",
|
||||||
"narHash": "sha256-AuixwSlYk34Z6+GEc7y4QotF3Hk963zC9I9hAwX5KCE=",
|
"rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f",
|
||||||
|
"revCount": 84,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../?dir=foundation"
|
"url": "file:../"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "foundation",
|
"dir": "foundation",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../?dir=foundation"
|
"url": "file:../"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lib": {
|
"lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"dirtyRev": "3f9d287065ac685ce500c2cddb35428b2927f5a2-dirty",
|
"lastModified": 1724190751,
|
||||||
"dirtyShortRev": "3f9d287-dirty",
|
"narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=",
|
||||||
"lastModified": 1720514984,
|
"ref": "master",
|
||||||
"narHash": "sha256-AuixwSlYk34Z6+GEc7y4QotF3Hk963zC9I9hAwX5KCE=",
|
"rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f",
|
||||||
|
"revCount": 84,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../?dir=lib"
|
"url": "file:../"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../?dir=lib"
|
"url": "file:../"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
|
|
@ -65,7 +65,15 @@ in
|
||||||
PATH =
|
PATH =
|
||||||
let
|
let
|
||||||
bins = lib.paths.bin (
|
bins = lib.paths.bin (
|
||||||
(lib.packages.dependencies.get dependencies.build.host)
|
(lib.packages.dependencies.get dependencies.build.only)
|
||||||
|
++ (lib.packages.dependencies.get dependencies.build.build)
|
||||||
|
++ (lib.packages.dependencies.get dependencies.build.host)
|
||||||
|
++ (lib.packages.dependencies.get dependencies.build.target)
|
||||||
|
++ (lib.packages.dependencies.get dependencies.host.only)
|
||||||
|
++ (lib.packages.dependencies.get dependencies.host.host)
|
||||||
|
++ (lib.packages.dependencies.get dependencies.host.target)
|
||||||
|
++ (lib.packages.dependencies.get dependencies.target.only)
|
||||||
|
++ (lib.packages.dependencies.get dependencies.target.target)
|
||||||
++ [
|
++ [
|
||||||
foundation.stage2-bash
|
foundation.stage2-bash
|
||||||
foundation.stage2-coreutils
|
foundation.stage2-coreutils
|
||||||
|
@ -99,6 +107,7 @@ in
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
|
# (builtins.trace "build: ${package.name} -> build=${package.platform.build.triple} host=${package.platform.host.triple} target=${package.platform.target.triple}")
|
||||||
built
|
built
|
||||||
// {
|
// {
|
||||||
inherit (package) meta;
|
inherit (package) meta;
|
||||||
|
|
|
@ -26,16 +26,32 @@ in
|
||||||
# }))
|
# }))
|
||||||
# .config;
|
# .config;
|
||||||
foundation-gcc = config.packages.foundation.gcc;
|
foundation-gcc = config.packages.foundation.gcc;
|
||||||
|
foundation-glibc = config.packages.foundation.glibc;
|
||||||
foundation-binutils = config.packages.foundation.binutils;
|
foundation-binutils = config.packages.foundation.binutils;
|
||||||
foundation-linux-headers = config.packages.foundation.linux-headers;
|
foundation-linux-headers = config.packages.foundation.linux-headers;
|
||||||
# foundation-linux-headers = config.packages.foundation.linux-headers.versions.latest.extend {
|
# foundation-linux-headers = config.packages.foundation.linux-headers.versions.latest.extend {
|
||||||
# platform.host = lib.modules.overrides.force "x86_64-linux";
|
# platform.host = lib.modules.overrides.force "x86_64-linux";
|
||||||
# };
|
# };
|
||||||
# example-x = config.packages.example.x;
|
|
||||||
cross-aux-a-x86_64-linux = config.packages.cross.x86_64-linux.aux.a;
|
cross-aux-a-x86_64-linux = config.packages.cross.x86_64-linux.aux.a;
|
||||||
cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc;
|
cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc;
|
||||||
|
|
||||||
|
example-a = config.packages.foundation.gcc.versions.latest.extend {
|
||||||
|
platform = {
|
||||||
|
target = lib.modules.override 0 "x86_64-linux";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
# exported.packages.i686-linux.example-b =
|
||||||
|
# let
|
||||||
|
# pkg =
|
||||||
|
# config.packages.foundation.gcc.versions.latest.extend {
|
||||||
|
# platform = {
|
||||||
|
# target = "aarch64-linux";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
# in
|
||||||
|
# pkg.package;
|
||||||
|
|
||||||
# exported.packages.i686-linux.cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc.package;
|
# exported.packages.i686-linux.cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc.package;
|
||||||
};
|
};
|
||||||
|
|
|
@ -230,6 +230,34 @@ in
|
||||||
default.value = [ ];
|
default.value = [ ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# extend = lib.options.create {
|
||||||
|
# description = "Extend the package definition.";
|
||||||
|
# type = lib.types.function lib.types.raw;
|
||||||
|
# internal = true;
|
||||||
|
# writable = false;
|
||||||
|
# default.value = module:
|
||||||
|
# let
|
||||||
|
# normalized =
|
||||||
|
# if builtins.isList module then
|
||||||
|
# module
|
||||||
|
# else if builtins.isFunction module || module ? config then
|
||||||
|
# [ module ]
|
||||||
|
# else
|
||||||
|
# [{
|
||||||
|
# config = module;
|
||||||
|
# }];
|
||||||
|
# result = meta.extend {
|
||||||
|
# modules =
|
||||||
|
# normalized ++ [
|
||||||
|
# {
|
||||||
|
# config.__modules__ = lib.modules.overrides.force (config.__modules__ ++ normalized);
|
||||||
|
# }
|
||||||
|
# ];
|
||||||
|
# };
|
||||||
|
# in
|
||||||
|
# result.config;
|
||||||
|
# };
|
||||||
|
|
||||||
extend = lib.options.create {
|
extend = lib.options.create {
|
||||||
description = "Extend the package definition.";
|
description = "Extend the package definition.";
|
||||||
type = lib.types.function lib.types.raw;
|
type = lib.types.function lib.types.raw;
|
||||||
|
@ -246,13 +274,14 @@ in
|
||||||
[{
|
[{
|
||||||
config = module;
|
config = module;
|
||||||
}];
|
}];
|
||||||
result = meta.extend {
|
|
||||||
modules =
|
modules = config.__modules__ ++ normalized;
|
||||||
normalized ++ [
|
|
||||||
{
|
result = lib.modules.run {
|
||||||
config.__modules__ = lib.modules.overrides.force (config.__modules__ ++ normalized);
|
modules = [
|
||||||
}
|
submodule
|
||||||
];
|
{ config.__modules__ = modules; }
|
||||||
|
] ++ modules;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
result.config;
|
result.config;
|
||||||
|
@ -261,8 +290,8 @@ in
|
||||||
meta = {
|
meta = {
|
||||||
description = lib.options.create {
|
description = lib.options.create {
|
||||||
description = "The description for the package.";
|
description = "The description for the package.";
|
||||||
type = lib.types.nullish lib.types.string;
|
type = lib.types.string;
|
||||||
default.value = null;
|
default.value = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
homepage = lib.options.create {
|
homepage = lib.options.create {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib', config }:
|
{ config }:
|
||||||
let
|
let
|
||||||
inherit (config) builders packages;
|
inherit (config) builders packages;
|
||||||
in
|
in
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{ lib
|
||||||
lib,
|
, lib'
|
||||||
lib',
|
, config
|
||||||
config,
|
, options
|
||||||
options,
|
,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (config)
|
inherit (config)
|
||||||
|
@ -27,7 +27,14 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config =
|
||||||
|
let
|
||||||
|
isBuildBootstrapped = config.platform.build.double == "i686-linux";
|
||||||
|
isHostBootstrapped = config.platform.host.double == "i686-linux";
|
||||||
|
|
||||||
|
isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
|
||||||
|
in
|
||||||
|
{
|
||||||
meta = {
|
meta = {
|
||||||
platforms = [ "i686-linux" ];
|
platforms = [ "i686-linux" ];
|
||||||
};
|
};
|
||||||
|
@ -39,15 +46,18 @@ in
|
||||||
|
|
||||||
deps = {
|
deps = {
|
||||||
build = {
|
build = {
|
||||||
host = {
|
only = {
|
||||||
inherit (packages.foundation) gcc;
|
gcc = lib.modules.when (!isBootstrapped) packages.foundation.gcc;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
PATH = lib.paths.bin [
|
PATH = lib.paths.bin (
|
||||||
# foundation.stage2-gcc
|
lib.lists.when isBootstrapped
|
||||||
|
[ foundation.stage2-gcc ]
|
||||||
|
++ [
|
||||||
|
foundation.stage2-gcc
|
||||||
foundation.stage2-binutils
|
foundation.stage2-binutils
|
||||||
foundation.stage2-gnumake
|
foundation.stage2-gnumake
|
||||||
foundation.stage2-gnupatch
|
foundation.stage2-gnupatch
|
||||||
|
@ -58,7 +68,8 @@ in
|
||||||
foundation.stage2-findutils
|
foundation.stage2-findutils
|
||||||
foundation.stage2-gnutar
|
foundation.stage2-gnutar
|
||||||
foundation.stage1-xz
|
foundation.stage1-xz
|
||||||
];
|
]
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
phases =
|
phases =
|
||||||
|
|
|
@ -84,20 +84,80 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config =
|
||||||
|
let
|
||||||
|
isBuildBootstrapped = config.platform.build.double == "i686-linux";
|
||||||
|
isHostBootstrapped = config.platform.host.double == "i686-linux";
|
||||||
|
|
||||||
|
isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
|
||||||
|
in
|
||||||
|
{
|
||||||
meta = {
|
meta = {
|
||||||
platforms = [ "i686-linux" ];
|
platforms = [ "i686-linux" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
pname = "gcc";
|
pname = "gcc-${config.platform.build.double}--${config.platform.host.double}--${config.platform.target.double}";
|
||||||
version = "13.2.0";
|
version = "13.2.0";
|
||||||
|
|
||||||
builder = builders.basic;
|
builder = builders.basic;
|
||||||
|
|
||||||
|
# hooks = ctx: let
|
||||||
|
#
|
||||||
|
# in {
|
||||||
|
# "aux:gcc:env" = lib.dag.entry.before [ "unpack" ] ''
|
||||||
|
#
|
||||||
|
# '';
|
||||||
|
# };
|
||||||
|
|
||||||
|
deps =
|
||||||
|
let
|
||||||
|
platform =
|
||||||
|
if !isBuildBootstrapped then
|
||||||
|
{
|
||||||
|
build = "i686-linux";
|
||||||
|
host = lib.modules.override 0 config.platform.build.triple;
|
||||||
|
target = lib.modules.override 0 config.platform.build.triple;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
build = "i686-linux";
|
||||||
|
host = "i686-linux";
|
||||||
|
target = lib.modules.override 0 config.platform.host.triple;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
build = {
|
||||||
|
only = {
|
||||||
|
gcc =
|
||||||
|
lib.modules.when
|
||||||
|
(!isBootstrapped)
|
||||||
|
(packages.foundation.gcc.versions.latest.extend {
|
||||||
|
inherit platform;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
build = {
|
||||||
|
binutils = packages.foundation.binutils;
|
||||||
|
linux-headers = packages.foundation.linux-headers;
|
||||||
|
glibc = packages.foundation.glibc;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
hooks = ctx: {
|
||||||
|
"aux:compiler:setup" = lib.dag.entry.before [ "unpack" ] ''
|
||||||
|
: ''${AUX_COMPILER_LIBRARY_PATH:=}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
PATH = lib.paths.bin [
|
PATH = lib.paths.bin (
|
||||||
|
lib.lists.when
|
||||||
|
(isBootstrapped)
|
||||||
|
[
|
||||||
foundation.stage2-gcc
|
foundation.stage2-gcc
|
||||||
foundation.stage2-binutils
|
# foundation.stage2-binutils
|
||||||
|
]
|
||||||
|
++ [
|
||||||
foundation.stage2-gnumake
|
foundation.stage2-gnumake
|
||||||
foundation.stage2-gnused
|
foundation.stage2-gnused
|
||||||
foundation.stage2-gnugrep
|
foundation.stage2-gnugrep
|
||||||
|
@ -108,16 +168,23 @@ in
|
||||||
foundation.stage2-gzip
|
foundation.stage2-gzip
|
||||||
foundation.stage2-bzip2
|
foundation.stage2-bzip2
|
||||||
foundation.stage1-xz
|
foundation.stage1-xz
|
||||||
];
|
]
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
phases =
|
phases =
|
||||||
let
|
let
|
||||||
host = lib.systems.withBuildInfo config.platform.host;
|
host = lib.systems.withBuildInfo config.platform.host;
|
||||||
|
|
||||||
|
compiler = if isBootstrapped then "gcc" else "${config.platform.build.triple}-gcc";
|
||||||
|
|
||||||
mbits = if host.system.cpu.family == "x86" then if host.is64bit then "-m64" else "-m32" else "";
|
mbits = if host.system.cpu.family == "x86" then if host.is64bit then "-m64" else "-m32" else "";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
"aux:compiler:setup" = ''
|
||||||
|
: ''${AUX_COMPILER_LIBRARY_PATH:=}
|
||||||
|
'';
|
||||||
|
|
||||||
unpack = ''
|
unpack = ''
|
||||||
# Unpack
|
# Unpack
|
||||||
tar xf ${config.src}
|
tar xf ${config.src}
|
||||||
|
@ -151,8 +218,8 @@ in
|
||||||
--build=${config.platform.build.triple} \
|
--build=${config.platform.build.triple} \
|
||||||
--host=${config.platform.host.triple} \
|
--host=${config.platform.host.triple} \
|
||||||
--target=${config.platform.target.triple} \
|
--target=${config.platform.target.triple} \
|
||||||
--with-native-system-header-dir=/include \
|
|
||||||
--with-sysroot=${foundation.stage1-musl} \
|
--with-sysroot=${foundation.stage1-musl} \
|
||||||
|
--with-native-system-header-dir=/include \
|
||||||
--enable-languages=c,c++ \
|
--enable-languages=c,c++ \
|
||||||
--disable-bootstrap \
|
--disable-bootstrap \
|
||||||
--disable-libsanitizer \
|
--disable-libsanitizer \
|
||||||
|
@ -170,7 +237,7 @@ in
|
||||||
|
|
||||||
install = ''
|
install = ''
|
||||||
# Install
|
# Install
|
||||||
make -j $NIX_BUILD_CORES install-strip
|
make -j $NIX_BUILD_CORES install
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -41,6 +41,12 @@ in
|
||||||
|
|
||||||
builder = builders.basic;
|
builder = builders.basic;
|
||||||
|
|
||||||
|
hooks = ctx: {
|
||||||
|
"aux:glibc:env" = lib.dag.entry.between ["aux:compiler:setup"] ["configure"] ''
|
||||||
|
AUX_COMPILER_LIBRARY_PATH="${config.package}/lib:$AUX_COMPILER_LIBRARY_PATH"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
PATH =
|
PATH =
|
||||||
let
|
let
|
||||||
|
@ -74,6 +80,8 @@ in
|
||||||
foundation.stage2-gnutar
|
foundation.stage2-gnutar
|
||||||
foundation.stage2-gzip
|
foundation.stage2-gzip
|
||||||
foundation.stage2-bzip2
|
foundation.stage2-bzip2
|
||||||
|
foundation.stage1-python
|
||||||
|
foundation.stage1-bison
|
||||||
foundation.stage1-xz
|
foundation.stage1-xz
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
@ -103,7 +111,7 @@ in
|
||||||
|
|
||||||
install = ''
|
install = ''
|
||||||
# Install
|
# Install
|
||||||
make -j $NIX_BUILD_CORES install-strip
|
make -j $NIX_BUILD_CORES INSTALL_UNCOMPRESSED=yes install
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue