Commit 3e0cb1ab authored by Alyssa Ross's avatar Alyssa Ross
Browse files

compiler-rt: use -ffreestanding when no libc 

This fixes building for x86_64-windows with no libc (for UEFI).
Otherwise, it would try to include a malloc header.
parent 6f72e87e

pkgs/development/compilers/llvm/10/compiler-rt/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ stdenv.mkDerivation { 
    "-DCMAKE_CXX_COMPILER_WORKS=ON"

    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"

    "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"

  ] ++ lib.optionals (useLLVM && !haveLibc) [

    "-DCMAKE_C_FLAGS=-nodefaultlibs"

  ] ++ lib.optionals (useLLVM) [

    "-DCOMPILER_RT_BUILD_BUILTINS=ON"

    #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@@ -90,6 +88,10 @@ stdenv.mkDerivation { 
      --replace "#include <assert.h>" ""

  '';



  preConfigure = lib.optionalString (useLLVM && !haveLibc) ''

    cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")

  '';



  # Hack around weird upsream RPATH bug

  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''

    ln -s "$out/lib"/*/* "$out/lib"

pkgs/development/compilers/llvm/11/compiler-rt/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ stdenv.mkDerivation { 
    "-DCMAKE_CXX_COMPILER_WORKS=ON"

    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"

    "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"

  ] ++ lib.optionals (!haveLibc) [

    "-DCMAKE_C_FLAGS=-nodefaultlibs"

  ] ++ lib.optionals (useLLVM || isNewDarwinBootstrap) [

    "-DCOMPILER_RT_BUILD_BUILTINS=ON"

    #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@@ -75,6 +73,8 @@ stdenv.mkDerivation { 


  preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''

    cmakeFlagsArray+=("-DCMAKE_LIPO=$(command -v ${stdenv.cc.targetPrefix}lipo)")

  '' + lib.optionalString (!haveLibc) ''

    cmakeFlagsArray+=("-DCMAKE_C_FLAGS=-nodefaultlibs -ffreestanding")

  '';



  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks

pkgs/development/compilers/llvm/12/compiler-rt/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ stdenv.mkDerivation { 
    "-DCMAKE_CXX_COMPILER_WORKS=ON"

    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"

    "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"

  ] ++ lib.optionals (useLLVM && !haveLibc) [

    "-DCMAKE_C_FLAGS=-nodefaultlibs"

  ] ++ lib.optionals (useLLVM) [

    "-DCOMPILER_RT_BUILD_BUILTINS=ON"

    #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@@ -93,6 +91,10 @@ stdenv.mkDerivation { 
      --replace "#include <assert.h>" ""

  '';



  preConfigure = lib.optionalString (useLLVM && !haveLibc) ''

    cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")

  '';



  # Hack around weird upsream RPATH bug

  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''

    ln -s "$out/lib"/*/* "$out/lib"

pkgs/development/compilers/llvm/13/compiler-rt/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ stdenv.mkDerivation { 
    "-DCMAKE_CXX_COMPILER_WORKS=ON"

    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"

    "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"

  ] ++ lib.optionals (useLLVM && !haveLibc) [

    "-DCMAKE_C_FLAGS=-nodefaultlibs"

  ] ++ lib.optionals (useLLVM) [

    "-DCOMPILER_RT_BUILD_BUILTINS=ON"

    #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@@ -100,6 +98,10 @@ stdenv.mkDerivation { 
      --replace "#include <assert.h>" ""

  '';



  preConfigure = lib.optionalString (useLLVM && !haveLibc) ''

    cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")

  '';



  # Hack around weird upsream RPATH bug

  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''

    ln -s "$out/lib"/*/* "$out/lib"

pkgs/development/compilers/llvm/14/compiler-rt/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ stdenv.mkDerivation { 
    "-DCMAKE_CXX_COMPILER_WORKS=ON"

    "-DCOMPILER_RT_BAREMETAL_BUILD=ON"

    "-DCMAKE_SIZEOF_VOID_P=${toString (stdenv.hostPlatform.parsed.cpu.bits / 8)}"

  ] ++ lib.optionals (useLLVM && !haveLibc) [

    "-DCMAKE_C_FLAGS=-nodefaultlibs"

  ] ++ lib.optionals (useLLVM) [

    "-DCOMPILER_RT_BUILD_BUILTINS=ON"

    #https://stackoverflow.com/questions/53633705/cmake-the-c-compiler-is-not-able-to-compile-a-simple-test-program
@@ -109,6 +107,10 @@ stdenv.mkDerivation { 
      --replace "#include <assert.h>" ""

  '';



  preConfigure = lib.optionalString (useLLVM && !haveLibc) ''

    cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")

  '';



  # Hack around weird upsream RPATH bug

  postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) ''

    ln -s "$out/lib"/*/* "$out/lib"