diff --git a/syscall/CMakeLists.txt b/syscall/CMakeLists.txt
index 5ad019828e2..ed49c7b0f5b 100644
--- a/syscall/CMakeLists.txt
+++ b/syscall/CMakeLists.txt
@@ -42,11 +42,9 @@ endif()
 if(CONFIG_SCHED_INSTRUMENTATION_SYSCALL)
   if(CONFIG_LIB_SYSCALL)
     target_sources(proxies PRIVATE syscall_names.c)
+    target_sources(stubs PRIVATE syscall_names.c)
   else()
-    target_sources(proxies PRIVATE syscall_names.c)
+    add_subdirectory(wraps)
+    target_sources(wraps PRIVATE syscall_names.c)
   endif()
 endif()
-
-if(CONFIG_SCHED_INSTRUMENTATION_SYSCALL)
-  add_subdirectory(wraps)
-endif()
diff --git a/syscall/wraps/CMakeLists.txt b/syscall/wraps/CMakeLists.txt
index 2be30de35e1..c252ae6e93d 100644
--- a/syscall/wraps/CMakeLists.txt
+++ b/syscall/wraps/CMakeLists.txt
@@ -19,14 +19,15 @@
 # ##############################################################################
 nuttx_add_kernel_library(wraps)
 
-list(TRANSFORM SYSCALLS PREPEND "${CMAKE_CURRENT_BINARY_DIR}/WRAPS_")
+list(TRANSFORM SYSCALLS PREPEND "${CMAKE_CURRENT_BINARY_DIR}/WRAP_")
 
 # generate files
-execute_process(
+add_custom_command(
   OUTPUT ${SYSCALLS}
   COMMAND ${CMAKE_BINARY_DIR}/bin/mksyscall -w
           ${CMAKE_CURRENT_LIST_DIR}/../syscall.csv
-  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS nuttx_host_tools)
+  WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+  DEPENDS mksyscall)
 
 # TODO: SYSCALLWRAPS = syscall_wraps.ldcmd $(Q) $(CPP) $(CPPFLAGS)
 # $(SYSCALLWRAPS:.ldcmd=.h) | \ sed -e '1,/WRAPOPTSTARTS/d' -e '/^#/d' >