diff options
| author | Artturi <Artturin@artturin.com> | 2023-09-07 01:58:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-07 01:58:51 +0300 |
| commit | fa3a4a18c01a32a5faf86c740dbeec84df668d13 (patch) | |
| tree | 662984095e0089fce1bc44f589823288ac8aaf74 /pkgs/build-support/cc-wrapper/default.nix | |
| parent | 32919b0a7a42e8a212d4e67ee27b82f904568b57 (diff) | |
| parent | 2946b819c209f4a1a9e87a725fc9e5ed2452c178 (diff) | |
Merge pull request #192459 from danielfullmer/fix-cc-wrapper-libdir
Diffstat (limited to 'pkgs/build-support/cc-wrapper/default.nix')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8412aabfe5fae..e1da3ceb5bc9e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -107,6 +107,8 @@ let && !(stdenv.targetPlatform.useAndroidPrebuilt or false) && !(stdenv.targetPlatform.isiOS or false) && gccForLibs != null; + gccForLibs_solib = getLib gccForLibs + + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: @@ -374,7 +376,7 @@ stdenv.mkDerivation { '' + optionalString useGccForLibs '' echo "-L${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-ldflags - echo "-L${gccForLibs.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags + echo "-L${gccForLibs_solib}/lib" >> $out/nix-support/cc-ldflags '' # TODO We would like to connect this to `useGccForLibs`, but we cannot yet |