Commit ee036ed5 authored by Alyssa Ross's avatar Alyssa Ross
Browse files

llvmPackages: don't exclude FreeBSD from -lunwind 

The exception for FreeBSD was added in 0afe9d1f ("freebsd packages:
Init at 13.1"), but it seems to have been erroneous, as e.g. ncurses
fails to build:

	x86_64-unknown-freebsd13-clang++  -o demo ../obj_s/demo.o -L../lib -lncurses++w -L../lib -lformw -lmenuw -lpanelw -lncursesw   -lutil     -DHAVE_CONFIG_H -DBUILDING_NCURSES_CXX -I../c++ -I. -I../include  -DNDEBUG -O2  -fPIC -DPIC
	x86_64-unknown-freebsd13-ld: error: undefined symbol: _Unwind_Resume
	>>> referenced by demo.cc
	>>>               ../obj_s/demo.o:(TestApplication::run())
	>>> referenced by demo.cc
	>>>               ../obj_s/demo.o:(_GLOBAL__sub_I_demo.cc)
	>>> referenced by demo.cc
	>>>               ../obj_s/demo.o:(NCursesUserItem<UserData>::NCursesUserItem(char const*, char const*, UserData const*))
	>>> referenced 46 more times
	clang-12: error: linker command failed with exit code 1 (use -v to see invocation)

This is fixed by undoing the change, adding -lunwind on FreeBSD.
parent bb7aafeb

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

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ let 
        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''

        echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) ''

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''

        echo "-lunwind" >> $out/nix-support/cc-ldflags

      '' + lib.optionalString stdenv.targetPlatform.isWasm ''

        echo "-fno-exceptions" >> $out/nix-support/cc-cflags

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ let 
        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''

        echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) ''

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''

        echo "-lunwind" >> $out/nix-support/cc-ldflags

      '' + lib.optionalString stdenv.targetPlatform.isWasm ''

        echo "-fno-exceptions" >> $out/nix-support/cc-cflags

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

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ let 
        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''

        echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) ''

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''

        echo "-lunwind" >> $out/nix-support/cc-ldflags

      '' + lib.optionalString stdenv.targetPlatform.isWasm ''

        echo "-fno-exceptions" >> $out/nix-support/cc-cflags

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

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ let 
        echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm) ''

        echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && stdenv.targetPlatform.useLLVM or false) ''

      '' + lib.optionalString (!stdenv.targetPlatform.isWasm && stdenv.targetPlatform.useLLVM or false) ''

        echo "-lunwind" >> $out/nix-support/cc-ldflags

      '' + lib.optionalString stdenv.targetPlatform.isWasm ''

        echo "-fno-exceptions" >> $out/nix-support/cc-cflags

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

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ let 
        ]

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

        ++ lib.optional

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

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

          "-lunwind"

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

    };