Unverified Commit 0c4a8b4f authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

Merge pull request #320472 from rhelmot/freebsd-libunwind-mess 

{llvm,freebsd.libcxxrt}: Sort out references to unwind functions
parents f33fb076 2cc0692e

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

+4 −4
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ in let 
      bintools = bintools';

      extraPackages = [

        targetLlvmLibraries.compiler-rt

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

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

        targetLlvmLibraries.libunwind

      ];

      extraBuildCommands = mkExtraBuildCommands cc;
@@ -246,12 +246,12 @@ in let 
          "-Wno-unused-command-line-argument"

          "-B${targetLlvmLibraries.compiler-rt}/lib"

        ]

        ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind"

        ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind"

        ++ lib.optional

          (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false)

          (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false)

          "-lunwind"

        ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

      nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

      nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

    };



    clangNoLibcxx = wrapCCWith rec {

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

+4 −4
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ in let 
      bintools = bintools';

      extraPackages = [

        targetLlvmLibraries.compiler-rt

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

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

        targetLlvmLibraries.libunwind

      ];

      extraBuildCommands = mkExtraBuildCommands cc;
@@ -288,12 +288,12 @@ in let 
          "-Wno-unused-command-line-argument"

          "-B${targetLlvmLibraries.compiler-rt}/lib"

        ]

        ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind"

        ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind"

        ++ lib.optional

          (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false)

          (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false)

          "-lunwind"

        ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

      nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

      nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

    };



    clangNoLibcxx = wrapCCWith rec {

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

+4 −4
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ in let 
      bintools = bintools';

      extraPackages = [

        targetLlvmLibraries.compiler-rt

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

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

        targetLlvmLibraries.libunwind

      ];

      extraBuildCommands = mkExtraBuildCommands cc;
@@ -289,12 +289,12 @@ in let 
          "-Wno-unused-command-line-argument"

          "-B${targetLlvmLibraries.compiler-rt}/lib"

        ]

        ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind"

        ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind"

        ++ lib.optional

          (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false)

          (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false)

          "-lunwind"

        ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

      nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

      nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

    };



    clangNoLibcxx = wrapCCWith rec {

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

+4 −4
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ in let 
      bintools = bintools';

      extraPackages = [

        targetLlvmLibraries.compiler-rt

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

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

        targetLlvmLibraries.libunwind

      ];

      extraBuildCommands = mkExtraBuildCommands cc;
@@ -273,12 +273,12 @@ in let 
          "-Wno-unused-command-line-argument"

          "-B${targetLlvmLibraries.compiler-rt}/lib"

        ]

        ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind"

        ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind"

        ++ lib.optional

          (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false)

          (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false)

          "-lunwind"

        ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

      nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

      nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

    };



    clangNoLibcxx = wrapCCWith rec {

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

+4 −4
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ in let 
      bintools = bintools';

      extraPackages = [

        targetLlvmLibraries.compiler-rt

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

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

        targetLlvmLibraries.libunwind

      ];

      extraBuildCommands = mkExtraBuildCommands cc;
@@ -272,12 +272,12 @@ in let 
          "-Wno-unused-command-line-argument"

          "-B${targetLlvmLibraries.compiler-rt}/lib"

        ]

        ++ lib.optional (!stdenv.targetPlatform.isWasm) "--unwindlib=libunwind"

        ++ lib.optional (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) "--unwindlib=libunwind"

        ++ lib.optional

          (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false)

          (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false)

          "-lunwind"

        ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";

      nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

      nixSupport.cc-ldflags = lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [ "-L${targetLlvmLibraries.libunwind}/lib" ];

    };



    clangNoLibcxx = wrapCCWith rec {