diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-04 06:01:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 06:01:49 +0000 |
| commit | b90e2fc451b4e620997c1405883fadea362c77dc (patch) | |
| tree | 108bd5a41e0fb42d989608fa0a92b98cad857efb /pkgs/development/compilers/gcc | |
| parent | 5e95c9c96cc749b3a00c8067e136e07202f89478 (diff) | |
| parent | 10d3ba75f063027a0019756d785be9e91a6f0c04 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -rw-r--r-- | pkgs/development/compilers/gcc/common/libgcc.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc/common/libgcc.nix b/pkgs/development/compilers/gcc/common/libgcc.nix index f3bf14e36f7eb..c8342ae90054a 100644 --- a/pkgs/development/compilers/gcc/common/libgcc.nix +++ b/pkgs/development/compilers/gcc/common/libgcc.nix @@ -36,7 +36,7 @@ lib.optionals (lib.versionAtLeast version "11.0") (let targetPlatformSlash = - if hostPlatform.config == targetPlatform.config + if hostPlatform == targetPlatform then "" else "${targetPlatform.config}/"; @@ -83,7 +83,7 @@ in lib.optionalString (!langC) '' rm -f $out/lib/libgcc_s.so* '' - + lib.optionalString (hostPlatform.config != targetPlatform.config) '' + + lib.optionalString (hostPlatform != targetPlatform) '' mkdir -p $lib/lib/ ln -s ${targetPlatformSlash}lib $lib/lib '' |