livcxx build

This commit is contained in:
Joel Taylor 2014-08-21 16:15:31 -07:00
parent 7da056233f
commit 2e26f7bef1
6 changed files with 18 additions and 10 deletions

View file

@ -26,6 +26,6 @@ in stdenv.mkDerivation rec {
description = "A new implementation of the C++ standard library, targeting C++11";
license = "BSD";
maintainers = stdenv.lib.maintainers.shlevy;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -33,6 +33,6 @@ in stdenv.mkDerivation {
description = "A new implementation of low level support for a standard C++ library";
license = "BSD";
maintainers = stdenv.lib.maintainers.shlevy;
platforms = stdenv.lib.platforms.linux;
platforms = stdenv.lib.platforms.unix;
};
}

View file

@ -10,10 +10,6 @@ stdenv.mkDerivation (rec {
propagatedBuildInputs = [ncurses];
preConfigure = ''
export CC=clang
'';
patchFlags = "-p0";
patches =
[ ./link-against-ncurses.patch

View file

@ -1,4 +1,4 @@
{ stdenv, pkgs, config }:
{ stdenv, pkgs, config, haveLibCxx }:
import ../generic rec {
inherit config;
@ -27,11 +27,11 @@ import ../generic rec {
nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr";
nativeLibc = true;
inherit stdenv;
libcxx = pkgs.libcxx.override {
libcxx = if haveLibCxx then pkgs.libcxx.override {
libcxxabi = pkgs.libcxxabi.override {
libunwind = pkgs.libunwindNative;
};
};
} else null;
binutils = import ../../build-support/native-darwin-cctools-wrapper {inherit stdenv;};
clang = pkgs.clang_34;
coreutils = pkgs.coreutils;

View file

@ -37,6 +37,14 @@ rec {
inherit config;
stdenv = stdenvNative;
pkgs = stdenvNativePkgs;
haveLibCxx = true;
};
stdenvDarwinNaked = import ./darwin {
inherit config;
stdenv = stdenvNative;
pkgs = stdenvNativePkgs;
haveLibCxx = false;
};

View file

@ -1800,7 +1800,11 @@ let
openssh_with_kerberos = pkgs.appendToName "with-kerberos" (openssh.override { withKerberos = true; });
opensp = callPackage ../tools/text/sgml/opensp { };
opensp = callPackage ../tools/text/sgml/opensp {
stdenv = if stdenv.isDarwin
then allStdenvs.stdenvDarwinNaked
else stdenv;
};
spCompat = callPackage ../tools/text/sgml/opensp/compat.nix { };