diff options
author | Ben Wolsieffer <benwolsieffer@gmail.com> | 2019-08-12 18:59:01 -0400 |
---|---|---|
committer | Ben Wolsieffer <benwolsieffer@gmail.com> | 2020-03-04 16:12:36 -0500 |
commit | e1831ebea3bcb415800a74fe458f802e63549e1c (patch) | |
tree | acb6446926815c4f32a4e7ae1ad825b4b336167f /pkgs/build-support | |
parent | 85befe90b0e041984c1d5d3116385ae49f0ecf88 (diff) | |
download | nixpkgs-e1831ebea3bcb415800a74fe458f802e63549e1c.tar nixpkgs-e1831ebea3bcb415800a74fe458f802e63549e1c.tar.gz nixpkgs-e1831ebea3bcb415800a74fe458f802e63549e1c.tar.bz2 nixpkgs-e1831ebea3bcb415800a74fe458f802e63549e1c.tar.lz nixpkgs-e1831ebea3bcb415800a74fe458f802e63549e1c.tar.xz nixpkgs-e1831ebea3bcb415800a74fe458f802e63549e1c.tar.zst nixpkgs-e1831ebea3bcb415800a74fe458f802e63549e1c.zip |
gcc: move target-specific runtime libraries to separate output
Diffstat (limited to 'pkgs/build-support')
-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 b078bf2fbbd..9bac8feef6d 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -41,7 +41,9 @@ let libc_bin = if libc == null then null else getBin libc; libc_dev = if libc == null then null else getDev libc; libc_lib = if libc == null then null else getLib libc; - cc_solib = getLib cc; + cc_solib = getLib cc + + optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"; + # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. coreutils_bin = if nativeTools then "" else getBin coreutils; |