diff options
| author | volth <volth@webmaster.ms> | 2019-04-24 20:29:45 +0000 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-25 14:14:48 -0400 |
| commit | dba65df0349cf251084a5182c60da58a6a73cc5a (patch) | |
| tree | 7dc02a209c6d88f6bb229e7a6d833bf6ca0c677b /pkgs/build-support/cc-wrapper | |
| parent | 27a9fdb6ff88b927ddcc98f252885217da438963 (diff) | |
| download | nixpkgs-dba65df0349cf251084a5182c60da58a6a73cc5a.tar nixpkgs-dba65df0349cf251084a5182c60da58a6a73cc5a.tar.gz nixpkgs-dba65df0349cf251084a5182c60da58a6a73cc5a.tar.bz2 nixpkgs-dba65df0349cf251084a5182c60da58a6a73cc5a.tar.lz nixpkgs-dba65df0349cf251084a5182c60da58a6a73cc5a.tar.xz nixpkgs-dba65df0349cf251084a5182c60da58a6a73cc5a.tar.zst nixpkgs-dba65df0349cf251084a5182c60da58a6a73cc5a.zip | |
kernel: fix cross-build
Fix for #59225 regression proposed by @matthewbauer https://github.com/NixOS/nixpkgs/pull/59225#issuecomment-486398003 (cherry picked from commit a6ea72a77d1f8e794244b063a7e9780c1b47486d)
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 84548a6b1df..b52852a0f63 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -320,8 +320,8 @@ stdenv.mkDerivation { # -mfloat-abi only matters on arm32 but we set it here # unconditionally just in case. If the abi specifically sets hard # vs. soft floats we use it here. - + optionalString (targetPlatform ? platform.gcc.float-abi || targetPlatform.parsed.abi ? float) '' - echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi or targetPlatform.parsed.abi.float}" >> $out/nix-support/cc-cflags-before + + optionalString (targetPlatform ? platform.gcc.float-abi) '' + echo "-mfloat-abi=${targetPlatform.platform.gcc.float-abi}" >> $out/nix-support/cc-cflags-before '' + optionalString (targetPlatform ? platform.gcc.fpu) '' echo "-mfpu=${targetPlatform.platform.gcc.fpu}" >> $out/nix-support/cc-cflags-before |