auxolotl/labs
22
8
Fork 4
Code Issues 1 Pull requests 3 Actions Packages Projects Releases Wiki Activity

refactor: only support i686-linux for foundation gcc

Browse source
This commit is contained in:
Jake Hamilton 2024-07-03 12:34:36 -07:00
parent 193a52cbc8
commit b315ae81f6
Signed by: jakehamilton
GPG key ID: 9762169A1B35EA68
2 changed files with 185 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tidepool/src/builders/basic.nix
View file

@ -83,7 +83,6 @@ in {
} }
); );
in in
(builtins.trace "${package.name}: ${system}")
built built
// { // {
inherit (package) meta; inherit (package) meta;

59
tidepool/src/packages/foundation/gcc/default.nix
View file

@ -1,24 +1,24 @@
{ {
lib,
lib',
config, config,
options, options,
}: }: let
let inherit
inherit (config) (config)
lib
mirrors mirrors
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.
foundation foundation
packages
; ;
in in {
{
config.packages.foundation.gcc = { config.packages.foundation.gcc = {
versions = { versions = {
"latest" = "latest" = {
{ config, meta }: config,
{ meta,
}: {
options = { options = {
src = lib.options.create { src = lib.options.create {
type = lib.types.derivation; type = lib.types.derivation;
@ -91,28 +91,7 @@ in
builder = builders.basic; builder = builders.basic;
env = { env = {
PATH = PATH = lib.paths.bin [
let
gcc =
if
config.platform.build.triple == config.platform.host.triple
# 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.
else
# TODO: Create a gcc-cross package.
(meta.extend (args: {
config = {
platform = {
build = config.platform.build.triple;
host = config.platform.build.triple;
target = lib.modules.override.force config.platform.host.triple;
};
};
})).config.package;
in
lib.paths.bin [
foundation.stage2-gcc foundation.stage2-gcc
foundation.stage2-binutils foundation.stage2-binutils
foundation.stage2-gnumake foundation.stage2-gnumake
@ -128,13 +107,17 @@ in
]; ];
}; };
phases = phases = let
let host = lib.systems.withBuildInfo config.platform.host;
host = lib'.systems.withBuildInfo config.platform.host;
mbits = if host.system.cpu.family == "x86" then if host.is64bit then "-m64" else "-m32" else ""; mbits =
in if host.system.cpu.family == "x86"
{ then
if host.is64bit
then "-m64"
else "-m32"
else "";
in {
unpack = lib.dag.entry.before ["patch"] '' unpack = lib.dag.entry.before ["patch"] ''
# Unpack # Unpack
tar xf ${config.src} tar xf ${config.src}