Unverified Commit 9ad98695 authored by a-n-n-a-l-e-e's avatar a-n-n-a-l-e-e Committed by GitHub
Browse files

Merge pull request #297650 from a-n-n-a-l-e-e/libcxxabi_use_compiler_rt

llvmPackages_{12,13,14,15,16,17,git}.libcxx: add LIBCXXABI_COMPILER_RT flag
parents c7408bdb 5b1b33f0
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ let
  useLLVM = stdenv.hostPlatform.useLLVM or false;

  cxxabiCMakeFlags = lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [
    "-DLIBCXXABI_USE_COMPILER_RT=ON"
    "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
    "-DLIBCXXABI_ENABLE_THREADS=OFF"
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ let
  useLLVM = stdenv.hostPlatform.useLLVM or false;

  cxxabiCMakeFlags = lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [
    "-DLIBCXXABI_USE_COMPILER_RT=ON"
    "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
    "-DLIBCXXABI_ENABLE_THREADS=OFF"
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ let
  useLLVM = stdenv.hostPlatform.useLLVM or false;

  cxxabiCMakeFlags = lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [
    "-DLIBCXXABI_USE_COMPILER_RT=ON"
    "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
    "-DLIBCXXABI_ENABLE_THREADS=OFF"
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ let
  useLLVM = stdenv.hostPlatform.useLLVM or false;

  cxxabiCMakeFlags = lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [
    "-DLIBCXXABI_USE_COMPILER_RT=ON"
    "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
    "-DLIBCXXABI_ENABLE_THREADS=OFF"
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ let
  useLLVM = stdenv.hostPlatform.useLLVM or false;

  cxxabiCMakeFlags = lib.optionals (useLLVM && !stdenv.hostPlatform.isWasm) [
    "-DLIBCXXABI_USE_COMPILER_RT=ON"
    "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
  ] ++ lib.optionals stdenv.hostPlatform.isWasm [
    "-DLIBCXXABI_ENABLE_THREADS=OFF"
Loading