From 5ac4f3dcf6d54cc322ff0581518eaa207c53c5f6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 3 Feb 2014 18:54:25 -0500 Subject: [PATCH] llvm: Attempt to fix build on darwin Signed-off-by: Shea Levy --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4048429fdc..bbae9a7946e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2798,7 +2798,13 @@ let else stdenv; }; - llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { inherit newScope stdenv fetchurl; isl = isl_0_12; }); + llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { + inherit newScope fetchurl; + isl = isl_0_12; + stdenv = if stdenv.isDarwin + then stdenvAdapters.overrideGCC stdenv gccApple + else stdenv; + }); llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; }; mentorToolchains = recurseIntoAttrs (