diff options
| author | Jude Taylor <me@jude.bio> | 2015-07-27 14:25:34 -0700 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2015-07-27 14:25:40 -0700 |
| commit | fa6c8445c768a64c908fcd4d2955843622ba2550 (patch) | |
| tree | edf33a5aebc395f851a5a28f2ee84f9dfe0ad098 /pkgs/stdenv | |
| parent | 0a1a01535537d0bda69e59e07d134a7504781c66 (diff) | |
| download | nixlib-fa6c8445c768a64c908fcd4d2955843622ba2550.tar nixlib-fa6c8445c768a64c908fcd4d2955843622ba2550.tar.gz nixlib-fa6c8445c768a64c908fcd4d2955843622ba2550.tar.bz2 nixlib-fa6c8445c768a64c908fcd4d2955843622ba2550.tar.lz nixlib-fa6c8445c768a64c908fcd4d2955843622ba2550.tar.xz nixlib-fa6c8445c768a64c908fcd4d2955843622ba2550.tar.zst nixlib-fa6c8445c768a64c908fcd4d2955843622ba2550.zip | |
make libcxxStdenv work on both darwin and linux
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/pure-darwin/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/stdenv/pure-darwin/default.nix b/pkgs/stdenv/pure-darwin/default.nix index 92c6f321d36b..b40fbd8d446e 100644 --- a/pkgs/stdenv/pure-darwin/default.nix +++ b/pkgs/stdenv/pure-darwin/default.nix @@ -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 { |