diff --git a/platforms/nuttx/CMakeLists.txt b/platforms/nuttx/CMakeLists.txt
index df3898dcf85b..b2b0c7aee41d 100644
--- a/platforms/nuttx/CMakeLists.txt
+++ b/platforms/nuttx/CMakeLists.txt
@@ -52,7 +52,7 @@ list(APPEND nuttx_libs
 	nuttx_binfmt
 	nuttx_c
 	nuttx_configs
-	nuttx_cxx
+	nuttx_xx
 	nuttx_drivers
 	nuttx_fs
 	nuttx_mm
@@ -79,7 +79,7 @@ target_link_libraries(nuttx_arch
 )
 
 target_link_libraries(nuttx_c INTERFACE nuttx_drivers)
-target_link_libraries(nuttx_cxx INTERFACE nuttx_c)
+target_link_libraries(nuttx_xx INTERFACE nuttx_c)
 
 target_link_libraries(px4 PRIVATE
 
diff --git a/platforms/nuttx/cmake/px4_impl_os.cmake b/platforms/nuttx/cmake/px4_impl_os.cmake
index 6501d403a213..6dfdf9903257 100644
--- a/platforms/nuttx/cmake/px4_impl_os.cmake
+++ b/platforms/nuttx/cmake/px4_impl_os.cmake
@@ -122,7 +122,7 @@ function(px4_os_prebuild_targets)
 	endif()
 
 	add_library(prebuild_targets INTERFACE)
-	target_link_libraries(prebuild_targets INTERFACE nuttx_cxx nuttx_c nuttx_fs nuttx_mm nuttx_sched m gcc)
+	target_link_libraries(prebuild_targets INTERFACE nuttx_xx nuttx_c nuttx_fs nuttx_mm nuttx_sched m gcc)
 	add_dependencies(prebuild_targets DEPENDS nuttx_context uorb_headers)
 
 	# parse nuttx config options for cmake