commit a80f2c1e2dc724315f5a6e7824b2df82796265b1 · pyrox.dev/nixpkgs

+31

pkgs/development/compilers/llvm/19/libclc/use-default-paths.patch

···

       1
       1
       +
       From e8b910246d0c7c3d9fff994f71c6f8a48ec09a50 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Tristan Ross <tristan.ross@midstall.com>

     

       3
       3
       +
       Date: Sat, 24 Aug 2024 19:56:24 -0700

     

       4
       4
       +
       Subject: [PATCH] [libclc] use default paths with find_program when possible

     

       5
       5
       +
       

     

       6
       6
       +
       ---

     

       7
       7
       +
        libclc/CMakeLists.txt | 4 ++--

     

       8
       8
       +
        1 file changed, 2 insertions(+), 2 deletions(-)

     

       9
       9
       +
       

     

       10
       10
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       11
       11
       +
       index 02bb859ae8590b..6bcd8ae52a5794 100644

     

       12
       12
       +
       --- a/CMakeLists.txt

     

       13
       13
       +
       +++ b/CMakeLists.txt

     

       14
       14
       +
       @@ -55,7 +55,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI

     

       15
       15
       +
          # Import required tools

     

       16
       16
       +
          if( NOT EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} )

     

       17
       17
       +
            foreach( tool IN ITEMS clang llvm-as llvm-link opt )

     

       18
       18
       +
       -      find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )

     

       19
       19
       +
       +      find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} )

     

       20
       20
       +
              set( ${tool}_exe ${LLVM_TOOL_${tool}} )

     

       21
       21
       +
              set( ${tool}_target )

     

       22
       22
       +
            endforeach()

     

       23
       23
       +
       @@ -104,7 +104,7 @@ foreach( tool IN ITEMS clang opt llvm-as llvm-link )

     

       24
       24
       +
        endforeach()

     

       25
       25
       +
        

     

       26
       26
       +
        # llvm-spirv is an optional dependency, used to build spirv-* targets.

     

       27
       27
       +
       -find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )

     

       28
       28
       +
       +find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} )

     

       29
       29
       +
        

     

       30
       30
       +
        if( LLVM_SPIRV )

     

       31
       31
       +
          add_executable( libclc::llvm-spirv IMPORTED GLOBAL )

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

···

       279
       279
        
                         path = ../14;

     

       280
       280
        
                       }

     

       281
       281
        
                     ];

     

       282
       282
       +
                     "libclc/use-default-paths.patch" = [

     

       283
       283
       +
                       {

     

       284
       284
       +
                         after = "19";

     

       285
       285
       +
                         path = ../19;

     

       286
       286
       +
                       }

     

       287
       287
       +
                     ];

     

       282
       288
        
                   };

     

       283
       289
        
       

     

       284
       290
        
                   constraints = patches."${p}" or null;

+16 -6

pkgs/development/compilers/llvm/common/libclc.nix

···

       1
       1
       -
       { lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3 }:

     

       2
       2
       -
       

     

       1
       1
       +
       { lib, stdenv, version, runCommand, monorepoSrc, llvm, buildPackages, buildLlvmTools, ninja, cmake, python3, release_version, getVersionFile }:

     

       2
       2
       +
       let

     

       3
       3
       +
         spirv-llvm-translator = buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; };

     

       4
       4
       +
       in

     

       3
       5
        
       stdenv.mkDerivation rec {

     

       4
       6
        
         pname = "libclc";

     

       5
       7
        
         inherit version;

     
···

       16
       18
        
       

     

       17
       19
        
         patches = [

     

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

     

       19
       19
       -
         ];

     

       21
       21
       +
         ] # LLVM 19 changes how host tools are looked up.

     

       22
       22
       +
           # Need to remove NO_DEFAULT_PATH and the PATHS arguments for find_program

     

       23
       23
       +
           # so CMake can actually find the tools in nativeBuildInputs.

     

       24
       24
       +
           # https://github.com/llvm/llvm-project/pull/105969

     

       25
       25
       +
           ++ lib.optional (lib.versionAtLeast release_version "19") (getVersionFile "libclc/use-default-paths.patch");

     

       20
       26
        
       

     

       21
       27
        
         # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch

     

       22
       22
       -
         postPatch = ''

     

       28
       28
       +
         postPatch = lib.optionalString (lib.versionOlder release_version "19") ''

     

       23
       29
        
           substituteInPlace CMakeLists.txt \

     

       24
       30
        
             --replace 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

       25
       31
        
                       'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \

     
···

       30
       36
        
             --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \

     

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

     

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

     

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

     

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

     

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

     

       35
       41
        
           substituteInPlace CMakeLists.txt \

     

       36
       42
        
             --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins'

     

       37
       43
        
         '';

     

       38
       44
        
       

     

       39
       39
       -
         nativeBuildInputs = [ cmake ninja python3 ];

     

       45
       45
       +
         nativeBuildInputs = [ cmake ninja python3 ] ++ lib.optional (lib.versionAtLeast release_version "19") [

     

       46
       46
       +
           buildLlvmTools.clang.cc

     

       47
       47
       +
           buildLlvmTools.llvm

     

       48
       48
       +
           spirv-llvm-translator

     

       49
       49
       +
         ];

     

       40
       50
        
         buildInputs = [ llvm ];

     

       41
       51
        
         strictDeps = true;

     

       42
       52