cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

go: various gccgo changes (#211850)

Browse source 
* gccgo: mark broken on darwin

* gccgo12: init

create versioned gccgo for bootstrapping go

* go: use versioned gccgo for bootstrapping
This commit is contained in:
zowoq 2023-01-25 19:11:12 +10:00 committed by GitHub
parent 740037965b
commit d56f7d9fe4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/compilers/go/1.18.nix
View file

@ -18,7 +18,7 @@
let
useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { };
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { };
skopeoTest = skopeo.override { buildGoModule = buildGo118Module; };

2
pkgs/development/compilers/go/1.19.nix
View file

@ -18,7 +18,7 @@
let
useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap116.nix { };
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap116.nix { };
skopeoTest = skopeo.override { buildGoModule = buildGo119Module; };

2
pkgs/development/compilers/go/1.20.nix
View file

@ -18,7 +18,7 @@
let
useGccGoBootstrap = stdenv.buildPlatform.isMusl || stdenv.buildPlatform.isRiscV;
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo else buildPackages.callPackage ./bootstrap117.nix { };
goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap117.nix { };
skopeoTest = skopeo.override { buildGoModule = buildGo120Module; };

17
pkgs/top-level/all-packages.nix
View file

@ -14553,13 +14553,28 @@ with pkgs;
gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { };
gccgo = wrapCC ((if stdenv.hostPlatform.isMusl then gcc_latest else gcc).cc.override {
gccgo = wrapCC (gcc.cc.override {
name = "gccgo";
langCC = true; #required for go.
langC = true;
langGo = true;
langJit = true;
profiledCompiler = false;
} // {
# not supported on darwin: https://github.com/golang/go/issues/463
meta.broken = stdenv.hostPlatform.isDarwin;
});
gccgo12 = wrapCC (gcc12.cc.override {
name = "gccgo";
langCC = true; #required for go.
langC = true;
langGo = true;
langJit = true;
profiledCompiler = false;
} // {
# not supported on darwin: https://github.com/golang/go/issues/463
meta.broken = stdenv.hostPlatform.isDarwin;
});
ghdl = ghdl-mcode;