diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-04 06:01:18 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-04 06:01:18 +0000 |
commit | 10d3ba75f063027a0019756d785be9e91a6f0c04 (patch) | |
tree | 04829c5b80f67f0b0db67650452c374cae833926 /pkgs/development/compilers/gcc | |
parent | 98c4f38cf50024a82adaaeece8f282b4044db3eb (diff) | |
parent | 36f5b2e42b98688dea8b494ae02f3a09d73f54de (diff) | |
download | nixlib-10d3ba75f063027a0019756d785be9e91a6f0c04.tar nixlib-10d3ba75f063027a0019756d785be9e91a6f0c04.tar.gz nixlib-10d3ba75f063027a0019756d785be9e91a6f0c04.tar.bz2 nixlib-10d3ba75f063027a0019756d785be9e91a6f0c04.tar.lz nixlib-10d3ba75f063027a0019756d785be9e91a6f0c04.tar.xz nixlib-10d3ba75f063027a0019756d785be9e91a6f0c04.tar.zst nixlib-10d3ba75f063027a0019756d785be9e91a6f0c04.zip |
Merge master into staging-next
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 f3bf14e36f7e..c8342ae90054 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 '' |