This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git

commit 0a0118b93c8f324b1716a9401b6c66a9876adc60
Author: Arjav Patel <[email protected]>
AuthorDate: Sun May 31 10:11:14 2026 +0530

    system/microros: Wire libmicroros include layout and sim final link.
    
    libmicroros is installed by colcon under include/<pkg>/<pkg>/file.h
    for ament-packaged headers (e.g. rcl, rmw, rosidl) and the flat
    include/<pkg>/file.h for a few others (e.g. rclc). A single
    -I include/ therefore resolves <rclc/rclc.h> but not <rcl/rcl.h>.
    
    Enumerate every immediate subdirectory of include/ in addition to
    include/ itself so both layouts resolve.
    
    Switch the library hand-off from LDLIBS to EXTRA_LIBS. The sim
    target's final link pulls EXTRA_LIBS, not LDLIBS, so the previous
    form left rcl/rclc/rcutils symbols unresolved.
    
    Signed-off-by: Arjav Patel <[email protected]>
---
 system/microros/Make.defs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/system/microros/Make.defs b/system/microros/Make.defs
index ae95e997d..beb8a0c3d 100644
--- a/system/microros/Make.defs
+++ b/system/microros/Make.defs
@@ -23,8 +23,10 @@
 ifneq ($(CONFIG_SYSTEM_MICROROS),)
 CONFIGURED_APPS += $(APPDIR)/system/microros
 
-CFLAGS   += ${INCDIR_PREFIX}$(APPDIR)/system/microros/include
-CXXFLAGS += ${INCDIR_PREFIX}$(APPDIR)/system/microros/include
+MICROROS_INC_DIRS := $(APPDIR)/system/microros/include \
+                     $(wildcard $(APPDIR)/system/microros/include/*)
+CFLAGS   += $(foreach d,$(MICROROS_INC_DIRS),${INCDIR_PREFIX}$(d))
+CXXFLAGS += $(foreach d,$(MICROROS_INC_DIRS),${INCDIR_PREFIX}$(d))
 
-LDLIBS   += $(APPDIR)/system/microros/libmicroros.a
+EXTRA_LIBS += $(APPDIR)/system/microros/libmicroros.a
 endif

Reply via email to