Skip to content

Commit 3d118f9

Browse files
committed
[libclc] Fix dependencies between targets
We need file-level - not target-level - dependencies for these custom commands to re-trigger when their dependencies change.
1 parent a0f8191 commit 3d118f9

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

libclc/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
364364
set( spv_suffix ${arch_suffix}.spv )
365365
add_custom_command( OUTPUT ${spv_suffix}
366366
COMMAND ${LLVM_SPIRV} ${spvflags} -o ${spv_suffix} ${builtins_link_lib}
367-
DEPENDS ${builtins_link_lib_tgt}
367+
DEPENDS ${builtins_link_lib}
368368
)
369369
add_custom_target( "prepare-${spv_suffix}" ALL DEPENDS "${spv_suffix}" )
370370
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${spv_suffix}
@@ -376,7 +376,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
376376
add_custom_command( OUTPUT ${builtins_opt_lib_tgt}.bc
377377
COMMAND libclc::opt ${opt_flags} -o ${builtins_opt_lib_tgt}.bc
378378
${builtins_link_lib}
379-
DEPENDS libclc::opt ${builtins_link_lib_tgt}
379+
DEPENDS libclc::opt ${builtins_link_lib}
380380
)
381381
add_custom_target( ${builtins_opt_lib_tgt}
382382
ALL DEPENDS ${builtins_opt_lib_tgt}.bc
@@ -385,12 +385,13 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
385385
PROPERTIES TARGET_FILE ${builtins_opt_lib_tgt}.bc
386386
)
387387

388+
set( builtins_opt_lib $<TARGET_PROPERTY:${builtins_opt_lib_tgt},TARGET_FILE> )
389+
388390
# Add prepare target
389391
set( obj_suffix ${arch_suffix}.bc )
390392
add_custom_command( OUTPUT ${obj_suffix}
391-
COMMAND prepare_builtins -o ${obj_suffix}
392-
$<TARGET_PROPERTY:${builtins_opt_lib_tgt},TARGET_FILE>
393-
DEPENDS ${builtins_opt_lib_tgt} prepare_builtins )
393+
COMMAND prepare_builtins -o ${obj_suffix} ${builtins_opt_lib}
394+
DEPENDS ${builtins_opt_lib} prepare_builtins )
394395
add_custom_target( prepare-${obj_suffix} ALL DEPENDS ${obj_suffix} )
395396

396397
# nvptx-- targets don't include workitem builtins

0 commit comments

Comments
 (0)