1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index a39f013d1a9a..49fdad931b69 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }:
+{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
@@ -24,8 +24,19 @@ let
 
     clang = wrapCC self.clang-unwrapped;
 
+    libcxxClang = ccWrapperFun {
+      cc = self.clang-unwrapped;
+      isClang = true;
+      inherit (self) stdenv;
+      /* FIXME is this right? */
+      inherit (stdenv.cc) libc nativeTools nativeLibc;
+      extraPackages = [ self.libcxx self.libcxxabi ];
+    };
+
     stdenv = overrideCC stdenv self.clang;
 
+    libcxxStdenv = overrideCC stdenv self.libcxxClang;
+
     lldb = callPackage ./lldb.nix {};
 
     libcxx = callPackage ./libc++ {};