diff --git a/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch b/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch index 2fbcf56426d6..364d503dbdc7 100644 --- a/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch +++ b/pkgs/development/compilers/llvm/20/libclc/use-default-paths.patch @@ -1,22 +1,22 @@ -From e8b910246d0c7c3d9fff994f71c6f8a48ec09a50 Mon Sep 17 00:00:00 2001 -From: Tristan Ross -Date: Sat, 24 Aug 2024 19:56:24 -0700 -Subject: [PATCH] [libclc] use default paths with find_program when possible - ---- - libclc/CMakeLists.txt | 4 ++-- - 1 file changed, 1 insertions(+), 1 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt -index 02bb859ae8590b..6bcd8ae52a5794 100644 +index b0e7aac6f8f3..af17e62588fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -55,7 +55,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI +@@ -57,7 +57,7 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI # Import required tools if( NOT EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} ) foreach( tool IN ITEMS clang llvm-as llvm-link opt ) - find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) -+ find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} ) ++ find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} ) set( ${tool}_exe ${LLVM_TOOL_${tool}} ) set( ${tool}_target ) endforeach() +@@ -93,7 +93,7 @@ if( EXISTS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} ) + # and custom tools. + foreach( tool IN ITEMS clang llvm-as llvm-link opt ) + find_program( LLVM_CUSTOM_TOOL_${tool} ${tool} +- PATHS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) ++ PATHS ${LIBCLC_CUSTOM_LLVM_TOOLS_BINARY_DIR} ) + set( ${tool}_exe ${LLVM_CUSTOM_TOOL_${tool}} ) + set( ${tool}_target ) + endforeach() diff --git a/pkgs/development/compilers/llvm/common/patches.nix b/pkgs/development/compilers/llvm/common/patches.nix index 75a3659228e8..b97f8af6eae2 100644 --- a/pkgs/development/compilers/llvm/common/patches.nix +++ b/pkgs/development/compilers/llvm/common/patches.nix @@ -92,6 +92,10 @@ } ]; "libclc/use-default-paths.patch" = [ + { + after = "20"; + path = ../20; + } { after = "19"; before = "20";