From 5ca96b948c7acc307b9b0d7d6ff5f60c77763d8e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 3 May 2022 10:55:48 -0400 Subject: [PATCH] libcxxabi: Fix build against compiler-rt-using clang --- pkgs/development/compilers/llvm/13/libcxxabi/default.nix | 3 ++- pkgs/development/compilers/llvm/14/libcxxabi/default.nix | 3 ++- pkgs/development/compilers/llvm/git/libcxxabi/default.nix | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix index 0bdbee07b73..93a3b2a1ec8 100644 --- a/pkgs/development/compilers/llvm/13/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxxabi/default.nix @@ -37,7 +37,8 @@ stdenv.mkDerivation rec { "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" - ]; + ] ++ lib.optional stdenv.cc.isCompilerRT + "-DLIBCXXABI_USE_COMPILER_RT=ON"; installPhase = if stdenv.isDarwin then '' diff --git a/pkgs/development/compilers/llvm/14/libcxxabi/default.nix b/pkgs/development/compilers/llvm/14/libcxxabi/default.nix index 07aaa2737ce..25f90230b7b 100644 --- a/pkgs/development/compilers/llvm/14/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/14/libcxxabi/default.nix @@ -47,7 +47,8 @@ stdenv.mkDerivation rec { "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" - ]; + ] ++ lib.optional stdenv.cc.isCompilerRT + "-DLIBCXXABI_USE_COMPILER_RT=ON"; installPhase = if stdenv.isDarwin then '' diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index d64708ab040..0fecc396250 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -47,7 +47,9 @@ stdenv.mkDerivation rec { "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" ] ++ lib.optionals (!enableShared) [ "-DLIBCXXABI_ENABLE_SHARED=OFF" - ]; + ] ++ lib.optional stdenv.cc.isCompilerRT + "-DLIBCXXABI_USE_COMPILER_RT=ON"; + installPhase = if stdenv.isDarwin then ''