diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-01-02 00:39:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-02 00:39:30 +0100 |
| commit | 2bb33130cc3a00a8fb1a6afb341cf31079061e5a (patch) | |
| tree | e83349a409111610d1b12540b8820edad64f46f8 /pkgs/development/compilers | |
| parent | c2752f8228b22caf45d786b1a9faddb8346eb271 (diff) | |
| parent | c7bcb99ff266a8fc93ced3f4205ca305ec2e9186 (diff) | |
| download | nixlib-2bb33130cc3a00a8fb1a6afb341cf31079061e5a.tar nixlib-2bb33130cc3a00a8fb1a6afb341cf31079061e5a.tar.gz nixlib-2bb33130cc3a00a8fb1a6afb341cf31079061e5a.tar.bz2 nixlib-2bb33130cc3a00a8fb1a6afb341cf31079061e5a.tar.lz nixlib-2bb33130cc3a00a8fb1a6afb341cf31079061e5a.tar.xz nixlib-2bb33130cc3a00a8fb1a6afb341cf31079061e5a.tar.zst nixlib-2bb33130cc3a00a8fb1a6afb341cf31079061e5a.zip | |
Merge pull request #21541 from veprbl/libcpp37
libc++3.7: fix to use with clang 3.9
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/3.7/libc++/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/3.7/libc++/r242056.patch | 16 |
2 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix index 62402142a129..1196645b923e 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$NIX_BUILD_TOP/libcxxabi-${version}.src/include") ''; - patches = [ ./darwin.patch ]; + patches = [ + ./darwin.patch + ./r242056.patch + ]; buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch b/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch new file mode 100644 index 000000000000..96245e76653a --- /dev/null +++ b/pkgs/development/compilers/llvm/3.7/libc++/r242056.patch @@ -0,0 +1,16 @@ +--- a/include/string 2015/07/13 20:04:56 242056 ++++ b/include/string 2015/07/18 20:40:46 242623 +@@ -1936,7 +1936,12 @@ + template <class _CharT, class _Traits, class _Allocator> + inline _LIBCPP_INLINE_VISIBILITY + basic_string<_CharT, _Traits, _Allocator>::basic_string(const allocator_type& __a) +- : __r_(__a) ++#if _LIBCPP_STD_VER <= 14 ++ _NOEXCEPT_(is_nothrow_copy_constructible<allocator_type>::value) ++#else ++ _NOEXCEPT ++#endif ++: __r_(__a) + { + #if _LIBCPP_DEBUG_LEVEL >= 2 + __get_db()->__insert_c(this); |