gcj: fix build on Darwin #54578
gcj: fix build on Darwin #54578
Conversation
GrahamcOfBorg
added
6.topic: darwin
|
Awesome work! |
pkgs/top-level/all-packages.nix
Outdated
| @@ -7012,7 +7012,9 @@ in | |||
| profiledCompiler = false; | |||
| inherit zip unzip zlib boehmgc gettext pkgconfig perl; | |||
| inherit (gnome2) libart_lgpl; | |||
| }); | |||
| }).overrideAttrs (oldAttrs: { | |||
| strictDeps = stdenv.isDarwin; | |||
There was a problem hiding this comment.
IIRC gcc has strictDeps=true alread?
/cc @Ericson2314
There was a problem hiding this comment.
If it does, it didn't in November when I first authored this commit. Although this should definitely be oldAttrs.strictDeps or stdenv.isDarwin.
There was a problem hiding this comment.
You were right! We didn't need this, so I've dropped this change.
Partially addresses NixOS#29715.
| int_out=$(install_name_tool -id "$fn" "${flags[@]}" "$fn" 2>&1) | ||
| result=$? | ||
| if [ "$result" -ne 0 ] && | ||
| ! grep "shared library stub file and can't be changed" <<< "$out" |
There was a problem hiding this comment.
Is there a way to filter out these cases instead of ignoring potential other problems?
There was a problem hiding this comment.
My research at the time suggested that checking the output of install_name_tool was by far the simplest way to do it. I don’t think this would really ignore any other problems, since it’s quite specific.
Motivation for this change
Partially addresses #29715.
Part of #54573.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)