Commit 2ae30c9f authored by Alyssa Ross's avatar Alyssa Ross
Browse files

llvmPackages: use libcxxrt on FreeBSD 

FreeBSD doesn't use LLVM's cxxabi implementation, for backwards
compatibility reasons.  Software expects the libcxxrt API when
building on FreeBSD.  This fixes the build of
pkgsCross.x86_64-freebsd.boost.
parent c672de30

pkgs/build-support/cc-wrapper/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -372,11 +372,11 @@ stdenv.mkDerivation { 
        echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags

      done

    ''

    + optionalString (libcxx.isLLVM or false) (''

    + optionalString (libcxx.isLLVM or false) ''

      echo "-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags

      echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags

      echo "-lc++abi" >> $out/nix-support/libcxx-ldflags

    '')

      echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags

    ''



    ##

    ## Initial CFLAGS

pkgs/development/compilers/llvm/10/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ let 
      cc = tools.clang-unwrapped;

      libcxx = targetLlvmLibraries.libcxx;

      extraPackages = [

        targetLlvmLibraries.libcxxabi

        libcxx.cxxabi

        targetLlvmLibraries.compiler-rt

      ];

      extraBuildCommands = mkExtraBuildCommands cc;
@@ -147,7 +147,7 @@ let 
      libcxx = targetLlvmLibraries.libcxx;

      bintools = bintools';

      extraPackages = [

        targetLlvmLibraries.libcxxabi

        libcxx.cxxabi

        targetLlvmLibraries.compiler-rt

      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [

        targetLlvmLibraries.libunwind

pkgs/development/compilers/llvm/10/libcxx/default.nix

+10 −5
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version

{ lib, stdenv, llvm_meta, fetch, cmake, python3, fixDarwinDylibNames, version

, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else libcxxabi

, libcxxabi, libcxxrt

, enableShared ? !stdenv.hostPlatform.isStatic

}:



assert stdenv.isDarwin -> cxxabi.pname == "libcxxabi";



stdenv.mkDerivation {

  pname = "libcxx";

  inherit version;
@@ -37,13 +41,13 @@ stdenv.mkDerivation { 
    ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3

    ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;



  buildInputs = [ libcxxabi ];

  buildInputs = [ cxxabi ];



  cmakeFlags = [

    "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"

    "-DLIBCXX_LIBCPPABI_VERSION=2"

    "-DLIBCXX_CXX_ABI=libcxxabi"

    "-DLIBCXX_CXX_ABI=${cxxabi.pname}"

  ] ++ lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1"

    ++ lib.optional (cxxabi.pname == "libcxxabi") "-DLIBCXX_LIBCXXABI_LIB_PATH=${cxxabi}/lib"

    ++ lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON"

    ++ lib.optionals stdenv.hostPlatform.isWasm [

      "-DLIBCXX_ENABLE_THREADS=OFF"
@@ -60,13 +64,14 @@ stdenv.mkDerivation { 
      abiName=$(echo "$baseName" | sed -e 's/libc++/libc++abi/')



      for other in $(${stdenv.cc.targetPrefix}otool -L $file | awk '$1 ~ "/libc\\+\\+abi" { print $1 }'); do

        ${stdenv.cc.targetPrefix}install_name_tool -change $other ${libcxxabi}/lib/$abiName $file

        ${stdenv.cc.targetPrefix}install_name_tool -change $other ${cxxabi}/lib/$abiName $file

      done

    done

  '';



  passthru = {

    isLLVM = true;

    inherit cxxabi;

  };



  meta = llvm_meta // {

pkgs/development/compilers/llvm/10/libcxxabi/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ stdenv.mkDerivation { 
    install -m 644 ../include/${if stdenv.isDarwin then "*" else "cxxabi.h"} "$dev/include"

  '';



  passthru = {

    libName = "c++abi";

  };



  meta = llvm_meta // {

    homepage = "https://libcxxabi.llvm.org/";

    description = "Provides C++ standard library support";

pkgs/development/compilers/llvm/11/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ let 
      cc = tools.clang-unwrapped;

      libcxx = targetLlvmLibraries.libcxx;

      extraPackages = [

        targetLlvmLibraries.libcxxabi

        libcxx.cxxabi

        targetLlvmLibraries.compiler-rt

      ];

      extraBuildCommands = mkExtraBuildCommands cc;
@@ -162,7 +162,7 @@ let 
      libcxx = targetLlvmLibraries.libcxx;

      bintools = bintools';

      extraPackages = [

        targetLlvmLibraries.libcxxabi

        libcxx.cxxabi

        targetLlvmLibraries.compiler-rt

      ] ++ lib.optionals (!stdenv.targetPlatform.isWasm) [

        targetLlvmLibraries.libunwind