Unverified Commit 8bdc624b authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #272924 from wegank/llvm-17-libclc 

llvmPackages_17.libclc: init
parents fecc1aad f6da64f8

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

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ in let 
    # Has to be in tools despite mostly being a library,

    # because we use a native helper executable from a

    # non-cross build in cross builds.

    libclc = callPackage ./libclc {

    libclc = callPackage ../common/libclc.nix {

      inherit buildLlvmTools;

    };

  });

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

+6 −0
Original line number Diff line number Diff line
@@ -269,6 +269,12 @@ in let 
      nixSupport.cc-cflags = [ "-fno-exceptions" ];

    });



    # Has to be in tools despite mostly being a library,

    # because we use a native helper executable from a

    # non-cross build in cross builds.

    libclc = callPackage ../common/libclc.nix {

      inherit buildLlvmTools;

    };

  });



  libraries = lib.makeExtensible (libraries: let

pkgs/development/compilers/llvm/16/libclc/default.nix→pkgs/development/compilers/llvm/common/libclc.nix

+2 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 
  outputs = [ "out" "dev" ];



  patches = [

    ./libclc-gnu-install-dirs.patch

    ./libclc/libclc-gnu-install-dirs.patch

  ];



  # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec { 
      --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

                'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \

      --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

                'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'

                'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; }}/bin" NO_DEFAULT_PATH )'

  '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''

    substituteInPlace CMakeLists.txt \

      --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins'
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec { 
  '';



  meta = with lib; {

    broken = stdenv.isDarwin;

    homepage = "http://libclc.llvm.org/";

    description = "Implementation of the library requirements of the OpenCL C programming language";

    license = licenses.mit;