public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arrow-cpp, llvmPackage_9: Check stdenv.isi686 before stdenv.cc.isGNU

Browse Source 
See c3c245dcda8cc54055bca7fe08c59dd1d3a41408
This commit is contained in:
John Ericson 2019-12-25 01:32:00 -05:00
parent a8bd27b454
commit 694b81fabc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/all-packages.nix
View File

@ -8458,7 +8458,7 @@ in
inherit (stdenvAdapters) overrideCC; inherit (stdenvAdapters) overrideCC;
buildLlvmTools = buildPackages.llvmPackages_9.tools; buildLlvmTools = buildPackages.llvmPackages_9.tools;
targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; 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' stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4'
}); });
@ -10653,7 +10653,7 @@ in
arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ arrow-cpp = callPackage ../development/libraries/arrow-cpp ({
gtest = gtest.override { static = true; }; 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' stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4'
}); });