From 694b81fabc288c49cf2f1c29ae91f3c18def7a8d Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 25 Dec 2019 01:32:00 -0500 Subject: [PATCH] arrow-cpp, llvmPackage_9: Check stdenv.isi686 before stdenv.cc.isGNU See c3c245dcda8cc54055bca7fe08c59dd1d3a41408 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6a7963dfee3..4ba520e5f9b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8458,7 +8458,7 @@ in inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_9.tools; targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; - } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' }); @@ -10653,7 +10653,7 @@ in arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ gtest = gtest.override { static = true; }; - } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' });