Unverified Commit 70db7c7c authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #303438 from ExpidusOS/feat/llvm-git-commonify-lld 

llvmPackages_{12,13,14,15,16,17,18,git}: use common lld
parents b954abc0 1572ec6b

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

+5 −1
Original line number Diff line number Diff line
@@ -115,7 +115,11 @@ let 
      extraBuildCommands = mkExtraBuildCommands cc;

    };



    lld = callPackage ./lld {

    lld = callPackage ../common/lld {

      src = fetch "lld" "0qg3fgc7wj34hdkqn21y03zcmsdd01szhhm1hfki63iifrm3y2v9";

      patches = [

        ./lld/gnu-install-dirs.patch

      ];

      inherit llvm_meta;

      inherit (libraries) libunwind;

    };

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

+4 −1
Original line number Diff line number Diff line
@@ -140,7 +140,10 @@ in let 
      extraBuildCommands = mkExtraBuildCommands cc;

    };



    lld = callPackage ./lld {

    lld = callPackage ../common/lld {

      patches = [

        ./lld/gnu-install-dirs.patch

      ];

      inherit llvm_meta;

    };

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

deleted100644 → 0
+0 −55
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta

, buildLlvmTools

, src

, cmake

, libxml2

, libllvm

, version

}:



stdenv.mkDerivation rec {

  pname = "lld";

  inherit version;



  inherit src;

  sourceRoot = "${src.name}/${pname}";



  patches = [

    ./gnu-install-dirs.patch

  ];



  # On Darwin the llvm-config is perhaps not working fine as the

  # LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as the

  # include path is not correct.

  postPatch = lib.optionalString stdenv.isDarwin ''

    substituteInPlace MachO/CMakeLists.txt --replace \

      '(''${LLVM_MAIN_SRC_DIR}/' '(../'

  '';



  nativeBuildInputs = [ cmake ];

  buildInputs = [ libllvm libxml2 ];



  cmakeFlags = [

    "-DLLVM_CONFIG_PATH=${libllvm.dev}/bin/llvm-config${lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-native"}"

  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

    "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"

  ];



  # Musl's default stack size is too small for lld to be able to link Firefox.

  LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152";



  outputs = [ "out" "lib" "dev" ];



  meta = llvm_meta // {

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

    description = "The LLVM linker (unwrapped)";

    longDescription = ''

      LLD is a linker from the LLVM project that is a drop-in replacement for

      system linkers and runs much faster than them. It also provides features

      that are useful for toolchain developers.

      The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS), and

      WebAssembly in descending order of completeness. Internally, LLD consists

      of several different linkers.

    '';

  };

}

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

+5 −1
Original line number Diff line number Diff line
@@ -136,7 +136,11 @@ in let 
      extraBuildCommands = mkExtraBuildCommands cc;

    };



    lld = callPackage ./lld {

    lld = callPackage ../common/lld {

      patches = [

        ./lld/gnu-install-dirs.patch

        ./lld/fix-root-src-dir.patch

      ];

      inherit llvm_meta;

    };

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

deleted100644 → 0
+0 −58
Original line number Diff line number Diff line 
{ lib, stdenv, llvm_meta

, buildLlvmTools

, monorepoSrc, runCommand

, cmake

, libxml2

, libllvm

, version

}:



stdenv.mkDerivation rec {

  pname = "lld";

  inherit version;



  # Blank llvm dir just so relative path works

  src = runCommand "${pname}-src-${version}" {} ''

    mkdir -p "$out"

    cp -r ${monorepoSrc}/cmake "$out"

    cp -r ${monorepoSrc}/${pname} "$out"

    mkdir -p "$out/libunwind"

    cp -r ${monorepoSrc}/libunwind/include "$out/libunwind"

    mkdir -p "$out/llvm"

  '';



  sourceRoot = "${src.name}/${pname}";



  patches = [

    ./gnu-install-dirs.patch

    # On Darwin the llvm-config is perhaps not working fine as the

    # LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as

    # the include path is not correct.

    ./fix-root-src-dir.patch

  ];



  nativeBuildInputs = [ cmake ];

  buildInputs = [ libllvm libxml2 ];



  cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

    "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.llvm}/bin/llvm-tblgen"

  ];



  # Musl's default stack size is too small for lld to be able to link Firefox.

  LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152";



  outputs = [ "out" "lib" "dev" ];



  meta = llvm_meta // {

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

    description = "The LLVM linker (unwrapped)";

    longDescription = ''

      LLD is a linker from the LLVM project that is a drop-in replacement for

      system linkers and runs much faster than them. It also provides features

      that are useful for toolchain developers.

      The linker supports ELF (Unix), PE/COFF (Windows), Mach-O (macOS), and

      WebAssembly in descending order of completeness. Internally, LLD consists

      of several different linkers.

    '';

  };

}