From ee35de1861fa37c968619b3868a6a0e5b8caa949 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 27 Feb 2019 10:21:37 -0500 Subject: [PATCH] llvm7: build with gcc6 on 32-bit linux Need to use buildPackages.stdenv.cc.isGNU to avoid infinite recursion. We probably need a better way to handle this. Fixes #56457 --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 50a93da4aa1..5b231ba0c9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7389,11 +7389,13 @@ in stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' }); - llvmPackages_7 = callPackage ../development/compilers/llvm/7 { + llvmPackages_7 = callPackage ../development/compilers/llvm/7 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; - }; + } // stdenv.lib.optionalAttrs (buildPackages.stdenv.cc.isGNU && stdenv.hostPlatform.isi686) { + stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4' + }); llvmPackages_latest = llvmPackages_7;