public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make libcxxStdenv work on both darwin and linux

Browse Source
This commit is contained in:
Jude Taylor
2015-07-27 14:25:40 -07:00
parent 0a1a015355
commit fa6c8445c7
5 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/3.5/libc++/default.nix
+2
View File
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
linkCxxAbi = stdenv.isLinux;
setupHook = ./setup-hook.sh;
meta = {
pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
+2 -1
View File
@@ -1,2 +1,3 @@
linkCxxAbi="@linkCxxAbi@"
export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
pkgs/development/compilers/llvm/3.6/libc++/default.nix
+2
View File
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
linkCxxAbi = stdenv.isLinux;
setupHook = ./setup-hook.sh;
meta = {
pkgs/development/compilers/llvm/3.6/libc++/setup-hook.sh
+2 -1
View File
@@ -1,2 +1,3 @@
linkCxxAbi="@linkCxxAbi@"
export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
export NIX_CXXSTDLIB_LINK=" -lc++ -lc++abi"
export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
pkgs/stdenv/pure-darwin/default.nix
+2 -1
View File
@@ -134,7 +134,8 @@ in rec {
ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib/libc++.dylib
ln -s ${bootstrapTools}/include/c++ $out/include/c++
'';
setupHook = ../../development/compilers/llvm/3.5/libc++/setup-hook.sh;
linkCxxAbi = false;
setupHook = ../../development/compilers/llvm/3.6/libc++/setup-hook.sh;
};
libcxxabi = stdenv.mkDerivation {