diff options
| author | Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> | 2023-07-13 19:20:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 19:20:52 +0000 |
| commit | 3512318246de69e0f0f27262d2c2d55cec231f23 (patch) | |
| tree | dd9c2535df57048725117e84dcf7dbc1e3b597d3 /pkgs/top-level | |
| parent | 441c510d221fc39c15991795dcb60ea18e0604ca (diff) | |
| parent | 91ef45c98ad8b569cb39a5ddbb14894adb9822a3 (diff) | |
Merge pull request #243249 from amjoseph-nixpkgs/fix-gccNoLibc2
gcc: disable glibc<->libgcc circularity workaround for windows and LLVM
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00a89a950db64..c052b0537e9ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15371,6 +15371,14 @@ with pkgs; langCC = false; libcCross = libcCross1; targetPackages.stdenv.cc.bintools = binutilsNoLibc; + enableShared = + stdenv.targetPlatform.hasSharedLibraries + + # temporarily disabled due to breakage; + # see https://github.com/NixOS/nixpkgs/pull/243249 + && !stdenv.targetPlatform.isWindows + && !(stdenv.targetPlatform.useLLVM or false) + ; }; bintools = binutilsNoLibc; libc = libcCross1; |