Skip to content

Commit

Permalink
Merge pull request #15423 from dalaing/llvm-general-darwin
Browse files Browse the repository at this point in the history
llvm-general: Adds Darwin compatibilty
  • Loading branch information
peti committed Jul 19, 2016
2 parents 46655e4 + 0540a83 commit c2656d6
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
Expand Up @@ -630,8 +630,20 @@ self: super: {
# Uses OpenGL in testing
caramia = dontCheck super.caramia;

llvm-general-darwin = overrideCabal (super.llvm-general.override { llvm-config = pkgs.llvm_35; }) (drv: {
preConfigure = ''
sed -i llvm-general.cabal \
-e 's,extra-libraries: stdc++,extra-libraries: c++,'
'';
configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"];
librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or [];
});

# Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142
llvm-general = super.llvm-general.override { llvm-config = pkgs.llvm_35; };
llvm-general =
if pkgs.stdenv.isDarwin
then self.llvm-general-darwin
else super.llvm-general.override { llvm-config = pkgs.llvm_35; };

# Needs help finding LLVM.
spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;
Expand Down

0 comments on commit c2656d6

Please sign in to comment.