| 3 Oct 2025 |
 dramforever | yeah we can do that next cycle | 12:28:27 |
 Grimmauld (migrated to @grimmauld:m.grimmauld.de) | or you suggesting an overrideAttrs { patches = ....; } ? | 12:28:29 |
| dramforever | well it's less of a suggestion of action, and more of a "good" news: we (nixpkgs) didn't do something wrong | 12:29:45 |
| dramforever | so just to confirm, we don't actually use stdenvBootstrapTools, right | 12:31:29 |
| dramforever | oh, already mentioned | 12:31:53 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | just checking to be sure:
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 6a1507df734d..9cb28012d849 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -47,10 +47,17 @@ rec {
'';
};
- bootGCC = pkgs.gcc.cc.override {
+ bootGCC = (pkgs.gcc.cc.override {
enableLTO = false;
isl = null;
- };
+ }).overrideAttrs (old: {
+ patches = old.patches or [] ++ [
+ (pkgs.fetchpatch {
+ url = "https://github.com/gcc-mirror/gcc/commit/3f1f99ef82a65d66e3aaa429bf4fb746b93da0db.patch";
+ hash = "sha256-wKVuwrW22gSN1woYFYxsyVk49oYmbogIN6FWbU8cVds=";
+ })
+ ];
+ });
bootBinutils = pkgs.binutils.bintools.override {
withAllTargets = false;
| 12:36:24 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | might be the better fix, but at the very least it'll confirm whether it is indeed fixed by that commit | 12:37:12 |
| dramforever | i don't think it's necessarily worthwhile to make this "good" | 12:38:35 |
| dramforever | i confirmed this fixes stdenvBootstrapTools.aarch64-unknown-linux-gnu | 12:45:55 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | thats good, my x86_64 build is almost done | 12:46:18 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | if that works too, i'll do that patch instead and push it to my PR | 12:47:00 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | (and put you co-author, you did the digging upstream) | 12:47:17 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | okay, works on x86 too | 12:50:58 |
| dramforever | meanwhile is the darwin thing because we configure llvm as aarch64-apple-darwin | 12:53:46 |
| dramforever | and the python script is not happy with us calling it aarch64
assert "arm64" in config.host_triple or "x86_64" in config.host_triple
| 12:54:33 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | but isn't x86_64-darwin broken too? | 12:57:44 |
| dramforever | that's a different failure | 12:58:21 |
| dramforever | build works fine, test fails | 12:58:28 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | SOO MANY FAILS | 12:58:30 |
| dramforever | so the x86_64-darwin thing, we had ...-bootstrap-tools/lib/clang/19/include when it works | 13:05:25 |
| dramforever | and now it's gone | 13:05:29 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | HUH | 13:05:40 |
| dramforever | ignoring nonexistent directory "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-clang-21.1.1-lib/lib/clang/21/include"
| 13:05:44 |
| dramforever | oops | 13:05:49 |
| Grimmauld (migrated to @grimmauld:m.grimmauld.de) | thats worrying | 13:05:57 |
| dramforever | wait nevermind | 13:05:57 |
| dramforever | that's good right | 13:06:01 |
| dramforever | oh, not good | 13:06:36 |
| dramforever | the resource-dir is wrong | 13:06:40 |
| dramforever | resource-dir for clang-21 in bootstrap tools is broken by https://github.com/NixOS/nixpkgs/pull/420382 | 13:30:43 |
