diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:49:56 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:49:56 +0200 |
commit | c05d8295988697adbb920a7b4a999ae3670c5504 (patch) | |
tree | 7a5526cffad30206f814560c72f13829e4d9c396 /pkgs/build-support/gcc-cross-wrapper/default.nix | |
parent | f073df60d60444c30c49cb26d6b187a4100b41fe (diff) | |
parent | ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7 (diff) | |
download | nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.gz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.bz2 nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.lz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.xz nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.tar.zst nixlib-c05d8295988697adbb920a7b4a999ae3670c5504.zip |
Merge branch 'staging'
Diffstat (limited to 'pkgs/build-support/gcc-cross-wrapper/default.nix')
-rw-r--r-- | pkgs/build-support/gcc-cross-wrapper/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix index d3494b83a87b..505d80a6b2ac 100644 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ b/pkgs/build-support/gcc-cross-wrapper/default.nix @@ -44,7 +44,9 @@ stdenv.mkDerivation { ldWrapper = ./ld-wrapper.sh; utils = ./utils.sh; addFlags = ./add-flags; - inherit nativeTools nativeLibc nativePrefix gcc libc binutils; + inherit nativeTools nativeLibc nativePrefix gcc binutils; + libc = if libc ? out then libc.out else libc; + libc_dev = if libc ? dev then libc.dev else libc; crossConfig = if cross != null then cross.config else null; osxMinVersion = cross.osxMinVersion or null; gccLibs = if gcc != null then gccLibs else null; |