This commit is contained in:
parent
6d0463d37d
commit
5432ea31f1
|
@ -3,18 +3,17 @@
|
||||||
"lib": {
|
"lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"lastModified": 1723737980,
|
"dirtyRev": "2be3111b2c0911f40b47fe0a1fb22b5f5188cf59-dirty",
|
||||||
"narHash": "sha256-1WnFatW5kSuO2jjt62hvSbH84TSYyO+VmvkJ0d5e/ZY=",
|
"dirtyShortRev": "2be3111-dirty",
|
||||||
"ref": "master",
|
"lastModified": 1719251485,
|
||||||
"rev": "cadfaabc853d20f2bc20bad794fcbe520ea48f13",
|
"narHash": "sha256-63NvfFVeTDITfNu60rmCUlaZtAeZUnvrIaOLSk9ScC8=",
|
||||||
"revCount": 82,
|
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../"
|
"url": "file:../?dir=lib"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../"
|
"url": "file:../?dir=lib"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
|
|
@ -8,35 +8,33 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "foundation",
|
"dir": "foundation",
|
||||||
"lastModified": 1724190751,
|
"dirtyRev": "3f9d287065ac685ce500c2cddb35428b2927f5a2-dirty",
|
||||||
"narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=",
|
"dirtyShortRev": "3f9d287-dirty",
|
||||||
"ref": "master",
|
"lastModified": 1720514984,
|
||||||
"rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f",
|
"narHash": "sha256-AuixwSlYk34Z6+GEc7y4QotF3Hk963zC9I9hAwX5KCE=",
|
||||||
"revCount": 84,
|
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../"
|
"url": "file:../?dir=foundation"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "foundation",
|
"dir": "foundation",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../"
|
"url": "file:../?dir=foundation"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lib": {
|
"lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"lastModified": 1724190751,
|
"dirtyRev": "3f9d287065ac685ce500c2cddb35428b2927f5a2-dirty",
|
||||||
"narHash": "sha256-e8sOmeXS9YWuQqjW6gvtS3PIueazkf4S1iiJ/94eXv4=",
|
"dirtyShortRev": "3f9d287-dirty",
|
||||||
"ref": "master",
|
"lastModified": 1720514984,
|
||||||
"rev": "4b36a5a0133f5481840bdfaf693c971215a7ef1f",
|
"narHash": "sha256-AuixwSlYk34Z6+GEc7y4QotF3Hk963zC9I9hAwX5KCE=",
|
||||||
"revCount": 84,
|
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../"
|
"url": "file:../?dir=lib"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"dir": "lib",
|
"dir": "lib",
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "file:../"
|
"url": "file:../?dir=lib"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
|
|
|
@ -16,24 +16,17 @@ in
|
||||||
aux-a = config.packages.aux.a;
|
aux-a = config.packages.aux.a;
|
||||||
aux-b = config.packages.aux.b;
|
aux-b = config.packages.aux.b;
|
||||||
|
|
||||||
# foundation-gcc-x86_64 =
|
|
||||||
# (config.packages.foundation.gcc.versions."13.2.0".extend (args: {
|
|
||||||
# config = {
|
|
||||||
# platform = {
|
|
||||||
# target = lib.modules.overrides.force "x86_64-linux";
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# }))
|
|
||||||
# .config;
|
|
||||||
foundation-gcc = config.packages.foundation.gcc;
|
foundation-gcc = config.packages.foundation.gcc;
|
||||||
foundation-glibc = config.packages.foundation.glibc;
|
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 {
|
|
||||||
# platform.host = lib.modules.overrides.force "x86_64-linux";
|
cross-foundation-glibc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.glibc;
|
||||||
# };
|
cross-foundation-binutils-x86_64-linux = config.packages.cross.x86_64-linux.foundation.binutils;
|
||||||
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-tool-foundation-gcc-newlib-x86_64-linux = config.packages.cross-tools.x86_64-linux.foundation.gcc-newlib;
|
||||||
|
cross-tool-foundation-gcc-x86_64-linux = config.packages.cross-tools.x86_64-linux.foundation.gcc-cross;
|
||||||
|
cross-foundation-gcc-x86_64-linux = config.packages.cross.x86_64-linux.foundation.gcc-bootstrap;
|
||||||
|
|
||||||
example-a = config.packages.foundation.gcc.versions.latest.extend {
|
example-a = config.packages.foundation.gcc.versions.latest.extend {
|
||||||
platform = {
|
platform = {
|
||||||
|
@ -42,17 +35,5 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# 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;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@ let
|
||||||
|
|
||||||
doubles = lib.systems.doubles.all;
|
doubles = lib.systems.doubles.all;
|
||||||
|
|
||||||
packages = builtins.removeAttrs config.packages [ "cross" ];
|
packages = builtins.removeAttrs config.packages [ "cross" "cross-tools" ];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
includes = [
|
includes = [
|
||||||
|
@ -21,6 +21,14 @@ in
|
||||||
freeform = lib.types.packages;
|
freeform = lib.types.packages;
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
|
cross-tools = lib.attrs.generate doubles (
|
||||||
|
system:
|
||||||
|
lib.options.create {
|
||||||
|
description = "The cross-compilation tools for the ${system} target.";
|
||||||
|
type = lib.types.packages;
|
||||||
|
default.value = { };
|
||||||
|
}
|
||||||
|
);
|
||||||
cross = lib.attrs.generate doubles (
|
cross = lib.attrs.generate doubles (
|
||||||
system:
|
system:
|
||||||
lib.options.create {
|
lib.options.create {
|
||||||
|
@ -54,6 +62,36 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
|
packages.cross-tools = lib.attrs.generate doubles (
|
||||||
|
system:
|
||||||
|
builtins.mapAttrs
|
||||||
|
(
|
||||||
|
namespace:
|
||||||
|
builtins.mapAttrs (
|
||||||
|
name: alias:
|
||||||
|
let
|
||||||
|
setTarget =
|
||||||
|
package:
|
||||||
|
package
|
||||||
|
// {
|
||||||
|
__modules__ = package.__modules__ ++ [
|
||||||
|
{
|
||||||
|
config.platform = {
|
||||||
|
target = lib.modules.override 5 system;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
updated = alias // {
|
||||||
|
versions = builtins.mapAttrs (version: package: setTarget package) alias.versions;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
updated
|
||||||
|
)
|
||||||
|
)
|
||||||
|
packages
|
||||||
|
);
|
||||||
packages.cross = lib.attrs.generate doubles (
|
packages.cross = lib.attrs.generate doubles (
|
||||||
system:
|
system:
|
||||||
builtins.mapAttrs
|
builtins.mapAttrs
|
||||||
|
@ -62,7 +100,7 @@ in
|
||||||
builtins.mapAttrs (
|
builtins.mapAttrs (
|
||||||
name: alias:
|
name: alias:
|
||||||
let
|
let
|
||||||
setHost =
|
setPlatform =
|
||||||
package:
|
package:
|
||||||
package
|
package
|
||||||
// {
|
// {
|
||||||
|
@ -77,7 +115,7 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
updated = alias // {
|
updated = alias // {
|
||||||
versions = builtins.mapAttrs (version: package: setHost package) alias.versions;
|
versions = builtins.mapAttrs (version: package: setPlatform package) alias.versions;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
updated
|
updated
|
||||||
|
|
|
@ -33,10 +33,17 @@ in
|
||||||
isHostBootstrapped = config.platform.host.double == "i686-linux";
|
isHostBootstrapped = config.platform.host.double == "i686-linux";
|
||||||
|
|
||||||
isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
|
isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
|
||||||
|
|
||||||
|
isCross =
|
||||||
|
config.platform.build.double != config.platform.host.double
|
||||||
|
&& config.platform.host.double == config.platform.target.double;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
meta = {
|
meta = {
|
||||||
platforms = [ "i686-linux" ];
|
platforms = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
pname = "binutils";
|
pname = "binutils";
|
||||||
|
@ -47,15 +54,40 @@ in
|
||||||
deps = {
|
deps = {
|
||||||
build = {
|
build = {
|
||||||
only = {
|
only = {
|
||||||
gcc = lib.modules.when (!isBootstrapped) packages.foundation.gcc;
|
gcc = lib.modules.when (!isBootstrapped) (
|
||||||
|
if isCross then
|
||||||
|
packages.foundation.gcc-cross.versions.latest.extend
|
||||||
|
{
|
||||||
|
platform = lib.modules.override 0 {
|
||||||
|
inherit (config.platform) build target;
|
||||||
|
host = config.platform.build;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else
|
||||||
|
packages.foundation.gcc.versions.latest
|
||||||
|
);
|
||||||
|
glibc = lib.modules.when (isCross) (
|
||||||
|
packages.foundation.glibc.versions.latest.extend {
|
||||||
|
platform = lib.modules.override 0 {
|
||||||
|
inherit (config.platform) host target build;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
binutils = lib.modules.when (isCross) (
|
||||||
|
packages.foundation.binutils.versions.latest.extend {
|
||||||
|
platform = lib.modules.override 0 {
|
||||||
|
inherit (config.platform) target build;
|
||||||
|
host = config.platform.build;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
PATH = lib.paths.bin (
|
PATH = lib.paths.bin (
|
||||||
lib.lists.when isBootstrapped
|
lib.lists.when (isBootstrapped) [ foundation.stage2-gcc ]
|
||||||
[ foundation.stage2-gcc ]
|
|
||||||
++ [
|
++ [
|
||||||
foundation.stage2-gcc
|
foundation.stage2-gcc
|
||||||
foundation.stage2-binutils
|
foundation.stage2-binutils
|
||||||
|
@ -70,7 +102,9 @@ in
|
||||||
foundation.stage1-xz
|
foundation.stage1-xz
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
};
|
} // (lib.attrs.when (isCross) {
|
||||||
|
LDFLAGS_FOR_TARGET = "-B${config.deps.build.only.glibc.package}/lib -L${config.deps.build.only.glibc.package}/lib -I${config.deps.build.only.glibc.package}/include";
|
||||||
|
});
|
||||||
|
|
||||||
phases =
|
phases =
|
||||||
let
|
let
|
||||||
|
@ -79,9 +113,11 @@ in
|
||||||
./patches/deterministic.patch
|
./patches/deterministic.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags =
|
||||||
# "CC=musl-gcc"
|
lib.lists.when (!isCross) [
|
||||||
"LDFLAGS=--static"
|
"LDFLAGS=--static"
|
||||||
|
]
|
||||||
|
++ [
|
||||||
"--prefix=${builtins.placeholder "out"}"
|
"--prefix=${builtins.placeholder "out"}"
|
||||||
"--build=${config.platform.build.triple}"
|
"--build=${config.platform.build.triple}"
|
||||||
"--host=${config.platform.host.triple}"
|
"--host=${config.platform.host.triple}"
|
||||||
|
@ -103,6 +139,7 @@ in
|
||||||
"--with-lib-path=:"
|
"--with-lib-path=:"
|
||||||
|
|
||||||
"--disable-multilib"
|
"--disable-multilib"
|
||||||
|
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
84
tidepool/src/packages/foundation/gcc/bootstrap.nix
Normal file
84
tidepool/src/packages/foundation/gcc/bootstrap.nix
Normal file
|
@ -0,0 +1,84 @@
|
||||||
|
{ config, options }:
|
||||||
|
let
|
||||||
|
inherit (config)
|
||||||
|
lib
|
||||||
|
packages
|
||||||
|
;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
config.packages.foundation.gcc-bootstrap = {
|
||||||
|
versions = {
|
||||||
|
"latest" = config.packages.foundation.gcc.versions.latest.extend
|
||||||
|
(
|
||||||
|
{ config }:
|
||||||
|
{
|
||||||
|
config = {
|
||||||
|
meta = {
|
||||||
|
platforms = lib.modules.override 0 [
|
||||||
|
"i686-linux"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
deps = {
|
||||||
|
build = {
|
||||||
|
build = {
|
||||||
|
gcc = lib.modules.override 0 (
|
||||||
|
packages.foundation.gcc-cross.versions.latest.extend {
|
||||||
|
platform = lib.modules.override 0 {
|
||||||
|
build = "i686-linux";
|
||||||
|
target = config.platform.target;
|
||||||
|
host = "i686-linux";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
binutils = lib.modules.override 0 (
|
||||||
|
packages.foundation.binutils.versions.latest.extend {
|
||||||
|
platform = lib.modules.override 0 {
|
||||||
|
build = "i686-linux";
|
||||||
|
target = config.platform.target;
|
||||||
|
host = config.platform.host;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
glibc = lib.modules.override 0 (
|
||||||
|
packages.foundation.glibc.versions.latest.extend {
|
||||||
|
platform = lib.modules.override 0 {
|
||||||
|
build = "i686-linux";
|
||||||
|
target = config.platform.target;
|
||||||
|
host = config.platform.host;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
env = {
|
||||||
|
LIBRARY_PATH = lib.modules.override 0 "${config.deps.build.build.glibc.package}/lib";
|
||||||
|
LDFLAGS_FOR_TARGET =
|
||||||
|
lib.modules.override 0
|
||||||
|
"-L$(pwd)/${config.platform.target.triple}/libgcc -L${config.deps.build.build.glibc.package}/lib";
|
||||||
|
};
|
||||||
|
|
||||||
|
configureFlags = lib.modules.override 0 [
|
||||||
|
"--prefix=${builtins.placeholder "out"}"
|
||||||
|
# Pretend we're native even though we're not
|
||||||
|
"--build=${config.platform.target.triple}"
|
||||||
|
"--host=${config.platform.host.triple}"
|
||||||
|
"--target=${config.platform.target.triple}"
|
||||||
|
"--with-as=${config.deps.build.build.binutils.package}/bin/as"
|
||||||
|
"--with-ld=${config.deps.build.build.binutils.package}/bin/ld"
|
||||||
|
"--enable-languages=c,c++"
|
||||||
|
"--disable-bootstrap"
|
||||||
|
"--disable-libsanitizer"
|
||||||
|
"--disable-multilib"
|
||||||
|
"--with-native-system-header-dir=${config.deps.build.build.glibc.package}/include"
|
||||||
|
"--with-gxx-include-dir=${placeholder "out"}/include/c++/${config.version}/"
|
||||||
|
"--with-build-sysroot=/"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
104
tidepool/src/packages/foundation/gcc/cross.nix
Normal file
104
tidepool/src/packages/foundation/gcc/cross.nix
Normal file
|
@ -0,0 +1,104 @@
|
||||||
|
{ config, options }:
|
||||||
|
let
|
||||||
|
inherit (config)
|
||||||
|
lib
|
||||||
|
foundation
|
||||||
|
packages
|
||||||
|
;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
config.packages.foundation.gcc-cross = {
|
||||||
|
versions = {
|
||||||
|
"latest" = config.packages.foundation.gcc.versions.latest.extend
|
||||||
|
(
|
||||||
|
{ config }:
|
||||||
|
{
|
||||||
|
config =
|
||||||
|
let
|
||||||
|
programPrefix = lib.strings.when
|
||||||
|
(
|
||||||
|
config.platform.build.triple != config.platform.target.triple
|
||||||
|
) "${config.platform.target.triple}-";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
meta = {
|
||||||
|
platforms = lib.modules.override 0 [
|
||||||
|
"i686-linux"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
deps = {
|
||||||
|
build = {
|
||||||
|
build = {
|
||||||
|
binutils = (
|
||||||
|
packages.foundation.binutils.versions.latest.extend {
|
||||||
|
platform = lib.modules.override 0 config.platform;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
glibc = (
|
||||||
|
packages.foundation.glibc.versions.latest.extend {
|
||||||
|
platform = lib.modules.override 0 {
|
||||||
|
inherit (config.platform) build target;
|
||||||
|
host = config.platform.target;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
linux-headers = (
|
||||||
|
packages.foundation.linux-headers.versions.latest.extend {
|
||||||
|
platform.target = lib.modules.override 0 config.platform.target;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
env = {
|
||||||
|
# LIBRARY_PATH = lib.modules.override 0 "${foundation.stage1-musl}/lib";
|
||||||
|
CC = lib.modules.override 0 "gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so -idirafter ${foundation.stage1-musl}/include";
|
||||||
|
CXX = lib.modules.override 0 "g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so -idirafter ${foundation.stage1-musl}/include";
|
||||||
|
CFLAGS_FOR_TARGET =
|
||||||
|
lib.modules.override 0
|
||||||
|
"-Wl,-dynamic-linker -Wl,${config.deps.build.build.glibc.package}/lib/ld-linux-x86-64.so.2 -B${config.deps.build.build.glibc.package}/lib";
|
||||||
|
LDFLAGS_FOR_TARGET =
|
||||||
|
lib.modules.override 0
|
||||||
|
"-L$(pwd)/${config.platform.target.triple}/libgcc -L${config.deps.build.build.glibc.package}/lib";
|
||||||
|
};
|
||||||
|
|
||||||
|
configureFlags = lib.modules.override 0 [
|
||||||
|
"--prefix=${builtins.placeholder "out"}"
|
||||||
|
"--build=${config.platform.build.triple}"
|
||||||
|
"--host=${config.platform.host.triple}"
|
||||||
|
"--target=${config.platform.target.triple}"
|
||||||
|
"--with-as=${config.deps.build.build.binutils.package}/bin/${programPrefix}as"
|
||||||
|
"--with-ld=${config.deps.build.build.binutils.package}/bin/${programPrefix}ld"
|
||||||
|
"--enable-languages=c,c++"
|
||||||
|
"--disable-libsanitizer"
|
||||||
|
"--disable-lto"
|
||||||
|
"--disable-multilib"
|
||||||
|
"--with-headers=${config.deps.build.build.glibc.package}/include"
|
||||||
|
"--with-build-sysroot=/"
|
||||||
|
# "--with-sysroot=${config.deps.build.build.glibc.package}"
|
||||||
|
"--with-native-system-header-dir=${config.deps.build.build.glibc.package}/include"
|
||||||
|
];
|
||||||
|
|
||||||
|
phases.configure = lib.modules.override 0 ''
|
||||||
|
# Configure
|
||||||
|
|
||||||
|
mkdir build
|
||||||
|
cd build
|
||||||
|
echo PATH=$PATH
|
||||||
|
|
||||||
|
# TODO(vlinkz) Hack to fix missing crti.o and crtn.o. Figure out how to properly find their paths.
|
||||||
|
mkdir gcc
|
||||||
|
ln -sv ${config.deps.build.build.glibc.package}/lib/{crti.o,crtn.o} gcc
|
||||||
|
mkdir -p x86_64-unknown-linux-gnu/libstdc++-v3/src
|
||||||
|
ln -sv ${config.deps.build.build.glibc.package}/lib/{crti.o,crtn.o} x86_64-unknown-linux-gnu/libstdc++-v3/src
|
||||||
|
|
||||||
|
bash ../configure ${builtins.concatStringsSep " " config.configureFlags}
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -11,12 +11,11 @@ let
|
||||||
;
|
;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
config.packages.context.options = {
|
includes = [
|
||||||
"foundation:cflags" = lib.options.create {
|
./newlib.nix
|
||||||
type = lib.types.list.of lib.types.string;
|
./cross.nix
|
||||||
default.value = [ ];
|
./bootstrap.nix
|
||||||
};
|
];
|
||||||
};
|
|
||||||
|
|
||||||
config.packages.foundation.gcc = {
|
config.packages.foundation.gcc = {
|
||||||
versions = {
|
versions = {
|
||||||
|
@ -82,6 +81,16 @@ in
|
||||||
description = "Version of isl.";
|
description = "Version of isl.";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
configureFlags = lib.options.create {
|
||||||
|
type = lib.types.list.of lib.types.string;
|
||||||
|
description = "Flags to pass to the configure script.";
|
||||||
|
};
|
||||||
|
|
||||||
|
exports = lib.options.create {
|
||||||
|
type = lib.types.attrs.of lib.types.string;
|
||||||
|
description = "List of exports to add to the environment.";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config =
|
config =
|
||||||
|
@ -90,10 +99,34 @@ in
|
||||||
isHostBootstrapped = config.platform.host.double == "i686-linux";
|
isHostBootstrapped = config.platform.host.double == "i686-linux";
|
||||||
|
|
||||||
isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
|
isBootstrapped = isBuildBootstrapped && isHostBootstrapped;
|
||||||
|
|
||||||
|
crossTool =
|
||||||
|
(config.platform.target.triple != config.platform.host.triple)
|
||||||
|
&& (config.platform.host.triple == config.platform.build.triple);
|
||||||
|
cross =
|
||||||
|
(config.platform.target.triple != config.platform.host.triple)
|
||||||
|
&& (config.platform.host.triple == config.platform.target.triple);
|
||||||
|
|
||||||
|
programPrefix = lib.strings.when
|
||||||
|
(
|
||||||
|
config.platform.build.triple != config.platform.target.triple
|
||||||
|
) "${config.platform.target.triple}-";
|
||||||
|
|
||||||
|
libc = if isBootstrapped then foundation.stage1-musl else config.deps.build.build.glibc.package;
|
||||||
|
libcLd =
|
||||||
|
if isBootstrapped then
|
||||||
|
"${foundation.stage1-musl}/lib/libc.so"
|
||||||
|
else
|
||||||
|
"${config.deps.build.build.glibc.package}/lib/ld-linux-x86-64.so.2";
|
||||||
|
|
||||||
|
host = lib.systems.withBuildInfo config.platform.host;
|
||||||
|
target = lib.systems.withBuildInfo config.platform.target;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
meta = {
|
meta = {
|
||||||
platforms = [ "i686-linux" ];
|
platforms = [
|
||||||
|
"i686-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
pname = "gcc-${config.platform.build.double}--${config.platform.host.double}--${config.platform.target.double}";
|
pname = "gcc-${config.platform.build.double}--${config.platform.host.double}--${config.platform.target.double}";
|
||||||
|
@ -101,66 +134,25 @@ in
|
||||||
|
|
||||||
builder = builders.basic;
|
builder = builders.basic;
|
||||||
|
|
||||||
# hooks = ctx: let
|
deps = {
|
||||||
#
|
|
||||||
# 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 = {
|
build = {
|
||||||
only = {
|
build = lib.modules.when (!isBootstrapped) {
|
||||||
gcc =
|
gcc = packages.foundation.gcc-cross.versions.latest;
|
||||||
lib.modules.when
|
glibc = packages.foundation.glibc.versions.latest;
|
||||||
(!isBootstrapped)
|
linux-headers = packages.foundation.linux-headers.versions.latest;
|
||||||
(packages.foundation.gcc.versions.latest.extend {
|
binutils = packages.foundation.binutils.versions.latest;
|
||||||
inherit platform;
|
|
||||||
});
|
|
||||||
};
|
|
||||||
build = {
|
|
||||||
binutils = packages.foundation.binutils;
|
|
||||||
linux-headers = packages.foundation.linux-headers;
|
|
||||||
glibc = packages.foundation.glibc;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
hooks = ctx: {
|
env =
|
||||||
"aux:compiler:setup" = lib.dag.entry.before [ "unpack" ] ''
|
{
|
||||||
: ''${AUX_COMPILER_LIBRARY_PATH:=}
|
PATH = lib.modules.when (isBuildBootstrapped) (
|
||||||
'';
|
lib.paths.bin ([
|
||||||
};
|
|
||||||
|
|
||||||
env = {
|
|
||||||
PATH = lib.paths.bin (
|
|
||||||
lib.lists.when
|
|
||||||
(isBootstrapped)
|
|
||||||
[
|
|
||||||
foundation.stage2-gcc
|
|
||||||
# foundation.stage2-binutils
|
|
||||||
]
|
|
||||||
++ [
|
|
||||||
foundation.stage2-gnumake
|
foundation.stage2-gnumake
|
||||||
foundation.stage2-gnused
|
foundation.stage2-gnused
|
||||||
foundation.stage2-gnugrep
|
foundation.stage2-gnugrep
|
||||||
|
foundation.stage2-gnupatch
|
||||||
foundation.stage2-gawk
|
foundation.stage2-gawk
|
||||||
foundation.stage2-diffutils
|
foundation.stage2-diffutils
|
||||||
foundation.stage2-findutils
|
foundation.stage2-findutils
|
||||||
|
@ -168,23 +160,75 @@ in
|
||||||
foundation.stage2-gzip
|
foundation.stage2-gzip
|
||||||
foundation.stage2-bzip2
|
foundation.stage2-bzip2
|
||||||
foundation.stage1-xz
|
foundation.stage1-xz
|
||||||
]
|
] ++ (lib.lists.when (isBootstrapped) [
|
||||||
|
foundation.stage2-gcc
|
||||||
|
foundation.stage2-binutils
|
||||||
|
]))
|
||||||
);
|
);
|
||||||
|
CFLAGS_FOR_TARGET = "-Wl,-dynamic-linker -Wl,${libcLd}";
|
||||||
|
}
|
||||||
|
// lib.attrs.when (isBootstrapped) {
|
||||||
|
CC = "gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so";
|
||||||
|
CXX = "g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so";
|
||||||
|
}
|
||||||
|
// lib.attrs.when (!cross && !crossTool) {
|
||||||
|
LIBRARY_PATH = "${libc}/lib";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hooks =
|
||||||
|
let
|
||||||
|
flags =
|
||||||
|
if (isBootstrapped && !(cross || crossTool)) then
|
||||||
|
[
|
||||||
|
"-Wl,-dynamic-linker"
|
||||||
|
"-Wl,${foundation.stage1-musl}/lib/libc.so"
|
||||||
|
]
|
||||||
|
else
|
||||||
|
[
|
||||||
|
"-Wl,-dynamic-linker"
|
||||||
|
"-Wl,${config.deps.build.build.glibc.package}/lib/ld-linux${lib.strings.when (target.isx86 && target.is64bit) "-x86-64"}.so.2"
|
||||||
|
"-B${config.deps.build.build.glibc.package}/lib"
|
||||||
|
# "-idirafter ${config.deps.build.build.glibc.package}/include"
|
||||||
|
];
|
||||||
|
in
|
||||||
|
ctx: {
|
||||||
|
"aux:gcc:env" = lib.dag.entry.between [ "unpack" ] [ "configure" ] ''
|
||||||
|
export CC='${config.package}/bin/${programPrefix}gcc ${builtins.concatStringsSep " " flags}'
|
||||||
|
export CXX='${config.package}/bin/${programPrefix}g++ ${builtins.concatStringsSep " " flags}'
|
||||||
|
export CC_FOR_TARGET=$CC
|
||||||
|
export CXX_FOR_TARGET=$CXX
|
||||||
|
export CC_FOR_BUILD=$CC
|
||||||
|
export CXX_FOR_BUILD=$CXX
|
||||||
|
alias gcc='$CC'
|
||||||
|
alias g++='$CXX'
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
configureFlags =
|
||||||
|
[
|
||||||
|
"--prefix=${builtins.placeholder "out"}"
|
||||||
|
"--build=${config.platform.build.triple}"
|
||||||
|
"--host=${config.platform.host.triple}"
|
||||||
|
"--target=${config.platform.target.triple}"
|
||||||
|
"--enable-languages=c,c++"
|
||||||
|
"--disable-bootstrap"
|
||||||
|
"--disable-libsanitizer"
|
||||||
|
"--disable-multilib"
|
||||||
|
"--with-build-sysroot=/"
|
||||||
|
"--with-native-system-header-dir=${libc}/include"
|
||||||
|
]
|
||||||
|
++ lib.lists.when (isBootstrapped) [
|
||||||
|
"--disable-lto"
|
||||||
|
];
|
||||||
|
|
||||||
phases =
|
phases =
|
||||||
let
|
let
|
||||||
host = lib.systems.withBuildInfo config.platform.host;
|
patches = [
|
||||||
|
# Make binutils output deterministic by default.
|
||||||
compiler = if isBootstrapped then "gcc" else "${config.platform.build.triple}-gcc";
|
./patches/libstdc++-target.patch
|
||||||
|
];
|
||||||
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}
|
||||||
|
@ -201,33 +245,19 @@ in
|
||||||
'';
|
'';
|
||||||
|
|
||||||
patch = ''
|
patch = ''
|
||||||
# Patch
|
${lib.strings.concatMapSep "\n" (file: "patch -Np1 -i ${file}") patches}
|
||||||
|
${lib.strings.when (isBootstrapped && !(crossTool || cross))''
|
||||||
# force musl even if host triple is gnu
|
# force musl even if host triple is gnu
|
||||||
sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
|
sed -i 's|"os/gnu-linux"|"os/generic"|' libstdc++-v3/configure.host
|
||||||
|
''}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configure = ''
|
configure = ''
|
||||||
# Configure
|
# Configure
|
||||||
export CC="gcc -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
|
mkdir build
|
||||||
export CXX="g++ -Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
|
cd build
|
||||||
export CFLAGS_FOR_TARGET="-Wl,-dynamic-linker -Wl,${foundation.stage1-musl}/lib/libc.so"
|
|
||||||
export LIBRARY_PATH="${foundation.stage1-musl}/lib"
|
|
||||||
|
|
||||||
bash ./configure \
|
bash ../configure ${builtins.concatStringsSep " " config.configureFlags}
|
||||||
--prefix=$out \
|
|
||||||
--build=${config.platform.build.triple} \
|
|
||||||
--host=${config.platform.host.triple} \
|
|
||||||
--target=${config.platform.target.triple} \
|
|
||||||
--with-sysroot=${foundation.stage1-musl} \
|
|
||||||
--with-native-system-header-dir=/include \
|
|
||||||
--enable-languages=c,c++ \
|
|
||||||
--disable-bootstrap \
|
|
||||||
--disable-libsanitizer \
|
|
||||||
--disable-lto \
|
|
||||||
--disable-multilib \
|
|
||||||
--disable-plugin \
|
|
||||||
CFLAGS=-static \
|
|
||||||
CXXFLAGS=-static
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
build = ''
|
build = ''
|
||||||
|
@ -237,6 +267,12 @@ in
|
||||||
|
|
||||||
install = ''
|
install = ''
|
||||||
# Install
|
# Install
|
||||||
|
${
|
||||||
|
lib.strings.when (host.is64bit) ''
|
||||||
|
mkdir -p $out/lib
|
||||||
|
ln -s lib $out/lib64
|
||||||
|
''
|
||||||
|
}
|
||||||
make -j $NIX_BUILD_CORES install
|
make -j $NIX_BUILD_CORES install
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
71
tidepool/src/packages/foundation/gcc/newlib.nix
Normal file
71
tidepool/src/packages/foundation/gcc/newlib.nix
Normal file
|
@ -0,0 +1,71 @@
|
||||||
|
{ config, options }:
|
||||||
|
let
|
||||||
|
inherit (config)
|
||||||
|
lib
|
||||||
|
packages
|
||||||
|
;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
config.packages.foundation.gcc-newlib = {
|
||||||
|
versions = {
|
||||||
|
"latest" = config.packages.foundation.gcc.versions.latest.extend (
|
||||||
|
{ config }:
|
||||||
|
{
|
||||||
|
config =
|
||||||
|
let
|
||||||
|
programPrefix = lib.strings.when
|
||||||
|
(
|
||||||
|
config.platform.build.triple != config.platform.target.triple
|
||||||
|
) "${config.platform.target.triple}-";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
meta = {
|
||||||
|
platforms = lib.modules.override 0 [
|
||||||
|
"i686-linux"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
deps = {
|
||||||
|
build = {
|
||||||
|
build = {
|
||||||
|
binutils = (
|
||||||
|
packages.foundation.binutils.versions.latest.extend {
|
||||||
|
platform = lib.modules.override 0 config.platform;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
configureFlags = lib.modules.override 0 [
|
||||||
|
"--prefix=${builtins.placeholder "out"}"
|
||||||
|
"--build=${config.platform.build.triple}"
|
||||||
|
"--host=${config.platform.host.triple}"
|
||||||
|
"--target=${config.platform.target.triple}"
|
||||||
|
"--with-as=${config.deps.build.build.binutils.package}/bin/${programPrefix}as"
|
||||||
|
"--with-ld=${config.deps.build.build.binutils.package}/bin/${programPrefix}ld"
|
||||||
|
"--enable-languages=c,c++"
|
||||||
|
"--disable-bootstrap"
|
||||||
|
"--disable-libsanitizer"
|
||||||
|
"--disable-lto"
|
||||||
|
"--disable-multilib"
|
||||||
|
"--disable-plugin"
|
||||||
|
"--disable-libssp"
|
||||||
|
"--disable-libvtv"
|
||||||
|
"--disable-libstdcxx"
|
||||||
|
"--disable-libquadmath"
|
||||||
|
"--disable-threads"
|
||||||
|
"--disable-decimal-float"
|
||||||
|
"--disable-shared"
|
||||||
|
"--disable-libmudflap"
|
||||||
|
"--disable-libgomp"
|
||||||
|
"--disable-libatomic"
|
||||||
|
"--without-headers"
|
||||||
|
"--with-newlib"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
|
@ -0,0 +1,33 @@
|
||||||
|
# From https://github.com/NixOS/nixpkgs/blob/nixos-24.05/pkgs/development/compilers/gcc/patches/libstdc%2B%2B-target.patch
|
||||||
|
Patch to make the target libraries 'configure' scripts find the proper CPP.
|
||||||
|
I noticed that building the mingw32 cross compiler.
|
||||||
|
Looking at the build script for mingw in archlinux, I think that only nixos
|
||||||
|
needs this patch. I don't know why.
|
||||||
|
diff --git a/Makefile.in b/Makefile.in
|
||||||
|
index 93f66b6..d691917 100644
|
||||||
|
--- a/Makefile.in
|
||||||
|
+++ b/Makefile.in
|
||||||
|
@@ -266,6 +266,7 @@ BASE_TARGET_EXPORTS = \
|
||||||
|
AR="$(AR_FOR_TARGET)"; export AR; \
|
||||||
|
AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
|
||||||
|
CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
|
||||||
|
+ CPP="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CC; \
|
||||||
|
CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
|
||||||
|
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
||||||
|
CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
|
||||||
|
@@ -291,11 +292,13 @@ BASE_TARGET_EXPORTS = \
|
||||||
|
RAW_CXX_TARGET_EXPORTS = \
|
||||||
|
$(BASE_TARGET_EXPORTS) \
|
||||||
|
CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
|
||||||
|
- CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
|
||||||
|
+ CXX="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
|
||||||
|
+ CXXCPP="$(RAW_CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
|
||||||
|
|
||||||
|
NORMAL_TARGET_EXPORTS = \
|
||||||
|
$(BASE_TARGET_EXPORTS) \
|
||||||
|
- CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX;
|
||||||
|
+ CXX="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CXX; \
|
||||||
|
+ CXXCPP="$(CXX_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS -E"; export CXX;
|
||||||
|
|
||||||
|
# Where to find GMP
|
||||||
|
HOST_GMPLIBS = @gmplibs@
|
|
@ -3,6 +3,7 @@
|
||||||
lib',
|
lib',
|
||||||
config,
|
config,
|
||||||
options,
|
options,
|
||||||
|
packages,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (config)
|
inherit (config)
|
||||||
|
@ -10,6 +11,7 @@ let
|
||||||
builders
|
builders
|
||||||
# These are the upstream foundational packages exported from the Aux Foundation project.
|
# These are the upstream foundational packages exported from the Aux Foundation project.
|
||||||
|
|
||||||
|
packages
|
||||||
foundation
|
foundation
|
||||||
;
|
;
|
||||||
in
|
in
|
||||||
|
@ -26,12 +28,35 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config =
|
||||||
|
let
|
||||||
|
isCross =
|
||||||
|
(config.platform.build.triple != config.platform.host.triple)
|
||||||
|
&& (config.platform.host.triple == config.platform.target.triple);
|
||||||
|
|
||||||
|
binutils =
|
||||||
|
if isCross then
|
||||||
|
"${
|
||||||
|
(packages.foundation.binutils.versions.latest.extend {
|
||||||
|
platform = lib.modules.override 0 {
|
||||||
|
inherit (config.platform) build target;
|
||||||
|
host = config.platform.build;
|
||||||
|
};
|
||||||
|
}).package
|
||||||
|
}/${config.platform.target.triple}"
|
||||||
|
else
|
||||||
|
foundation.stage2-binutils;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
platforms = [ "i686-linux" ];
|
platforms = [
|
||||||
|
"i686-linux"
|
||||||
|
"x86_64-linux"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
pname = "gcc";
|
pname = "glibc";
|
||||||
version = "2.38";
|
version = "2.38";
|
||||||
|
|
||||||
src = builtins.fetchurl {
|
src = builtins.fetchurl {
|
||||||
|
@ -41,10 +66,16 @@ in
|
||||||
|
|
||||||
builder = builders.basic;
|
builder = builders.basic;
|
||||||
|
|
||||||
hooks = ctx: {
|
deps = {
|
||||||
"aux:glibc:env" = lib.dag.entry.between ["aux:compiler:setup"] ["configure"] ''
|
build = {
|
||||||
AUX_COMPILER_LIBRARY_PATH="${config.package}/lib:$AUX_COMPILER_LIBRARY_PATH"
|
host = {
|
||||||
'';
|
linux-headers = (
|
||||||
|
packages.foundation.linux-headers.versions.latest.extend {
|
||||||
|
platform.target = lib.modules.override 0 config.platform.target;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
env = {
|
env = {
|
||||||
|
@ -52,25 +83,22 @@ in
|
||||||
let
|
let
|
||||||
gcc =
|
gcc =
|
||||||
if
|
if
|
||||||
config.platform.build.triple == config.platform.host.triple
|
isCross
|
||||||
# If we're on the same system then we can use the existing GCC instance.
|
|
||||||
then
|
|
||||||
foundation.stage2-gcc
|
|
||||||
# Otherwise we are going to need a cross-compiler.
|
# Otherwise we are going to need a cross-compiler.
|
||||||
|
then
|
||||||
|
(packages.foundation.gcc-newlib.versions.latest.extend {
|
||||||
|
platform = lib.modules.override 0 {
|
||||||
|
inherit (config.platform) build target;
|
||||||
|
host = config.platform.build;
|
||||||
|
};
|
||||||
|
}).package
|
||||||
|
# If we're on the same system then we can use the existing GCC instance.
|
||||||
else
|
else
|
||||||
(meta.extend (args: {
|
foundation.stage2-gcc;
|
||||||
config = {
|
|
||||||
platform = {
|
|
||||||
build = config.platform.build.triple;
|
|
||||||
host = config.platform.build.triple;
|
|
||||||
target = lib.modules.override.force config.platform.host.triple;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
})).config.package;
|
|
||||||
in
|
in
|
||||||
lib.paths.bin [
|
lib.paths.bin [
|
||||||
foundation.stage2-gcc
|
gcc
|
||||||
foundation.stage2-binutils
|
binutils
|
||||||
foundation.stage2-gnumake
|
foundation.stage2-gnumake
|
||||||
foundation.stage2-gnused
|
foundation.stage2-gnused
|
||||||
foundation.stage2-gnugrep
|
foundation.stage2-gnugrep
|
||||||
|
@ -86,7 +114,9 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
phases = {
|
phases =
|
||||||
|
|
||||||
|
{
|
||||||
unpack = ''
|
unpack = ''
|
||||||
tar xf ${config.src}
|
tar xf ${config.src}
|
||||||
cd glibc-${config.version}
|
cd glibc-${config.version}
|
||||||
|
@ -95,13 +125,13 @@ in
|
||||||
configure = ''
|
configure = ''
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
# libstdc++.so is built against musl and fails to link
|
|
||||||
export CXX=false
|
|
||||||
bash ../configure \
|
bash ../configure \
|
||||||
--prefix=$out \
|
--prefix=$out \
|
||||||
--build=${config.platform.build.triple} \
|
--build=${config.platform.build.triple} \
|
||||||
--host=${config.platform.host.triple} \
|
--host=${config.platform.host.triple} \
|
||||||
--with-headers=${foundation.stage1-linux-headers}/include
|
--with-headers=${config.deps.build.host.linux-headers.package}/include \
|
||||||
|
--with-binutils=${binutils}/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
build = ''
|
build = ''
|
||||||
|
@ -111,7 +141,8 @@ in
|
||||||
|
|
||||||
install = ''
|
install = ''
|
||||||
# Install
|
# Install
|
||||||
make -j $NIX_BUILD_CORES INSTALL_UNCOMPRESSED=yes install
|
make -j $NIX_BUILD_CORES install
|
||||||
|
ln -sv $(ls -d ${config.deps.build.host.linux-headers.package}/include/* | grep -v scsi\$) $out/include/
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{ lib
|
||||||
lib,
|
, lib'
|
||||||
lib',
|
, config
|
||||||
config,
|
, options
|
||||||
options,
|
,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
inherit (config)
|
inherit (config)
|
||||||
|
@ -28,7 +28,7 @@ in
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
meta = {
|
meta = {
|
||||||
platforms = [ "i686-linux" ];
|
platforms = [ "x86_64-linux" "i686-linux" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
pname = "linux-headers";
|
pname = "linux-headers";
|
||||||
|
@ -60,7 +60,7 @@ in
|
||||||
'';
|
'';
|
||||||
|
|
||||||
build = ''
|
build = ''
|
||||||
make -j $NIX_BUILD_CORES CC=musl-gcc HOSTCC=musl-gcc ARCH=${config.platform.host.linux.arch} headers
|
make -j $NIX_BUILD_CORES CC=musl-gcc HOSTCC=musl-gcc ARCH=${config.platform.target.linux.arch} headers
|
||||||
'';
|
'';
|
||||||
|
|
||||||
install = ''
|
install = ''
|
||||||
|
|
Loading…
Reference in a new issue