(nuttx) branch master updated: tools/export: add hello_zig support in kernel mode for linux host

[xiaoxiang]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4c41d84d21 tools/export: add hello_zig support in kernel mode for 
linux host
4c41d84d21 is described below

commit 4c41d84d21c3af80a3fbd59b61b5b56817c416be
Author: Yanfeng Liu <yfliu2...@qq.com>
AuthorDate: Mon Jan 15 21:07:22 2024 +0800

    tools/export: add hello_zig support in kernel mode for linux host
    
    Signed-off-by: Yanfeng Liu <yfliu2...@qq.com>
---
 tools/Unix.mk     | 3 ++-
 tools/Zig.defs    | 2 ++
 tools/mkexport.sh | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/Unix.mk b/tools/Unix.mk
index 2207e9f28b..0597afc6e3 100644
--- a/tools/Unix.mk
+++ b/tools/Unix.mk
@@ -740,7 +740,8 @@ savedefconfig: apps_preconfig
 # that the archiver is 'ar'
 
 export: $(NUTTXLIBS)
-       $(Q) MAKE="${MAKE}" $(MKEXPORT) $(MKEXPORT_ARGS) -l "$(EXPORTLIBS)"
+       $(Q) ZIG="${ZIG}" ZIGFLAGS="${ZIGFLAGS}" MAKE="${MAKE}" \
+               $(MKEXPORT) $(MKEXPORT_ARGS) -l "$(EXPORTLIBS)"
 
 # General housekeeping targets:  dependencies, cleaning, etc.
 #
diff --git a/tools/Zig.defs b/tools/Zig.defs
index 870d7372fb..b1de13117e 100644
--- a/tools/Zig.defs
+++ b/tools/Zig.defs
@@ -39,4 +39,6 @@ endif
 
 # Convert cortex-xxx/sifive-exx to cortex_xxx/sifive_exx
 
+ifneq ($(LLVM_CPUTYPE),)
 ZIGFLAGS += -mcpu $(subst -,_,$(LLVM_CPUTYPE))
+endif
diff --git a/tools/mkexport.sh b/tools/mkexport.sh
index 14d3e39e49..e78839089b 100755
--- a/tools/mkexport.sh
+++ b/tools/mkexport.sh
@@ -243,6 +243,8 @@ echo "NM               = ${NM}" 
>>"${EXPORTDIR}/scripts/Make.defs"
 echo "STRIP            = ${STRIP}" >>"${EXPORTDIR}/scripts/Make.defs"
 echo "OBJCOPY          = ${OBJCOPY}" >>"${EXPORTDIR}/scripts/Make.defs"
 echo "OBJDUMP          = ${OBJDUMP}" >>"${EXPORTDIR}/scripts/Make.defs"
+echo "ZIG              = ${ZIG}" >>"${EXPORTDIR}/scripts/Make.defs"
+echo "ZIGFLAGS         = ${ZIGFLAGS}" >>"${EXPORTDIR}/scripts/Make.defs"
 echo "NXFLATLDFLAGS1   = ${NXFLATLDFLAGS1}" >>"${EXPORTDIR}/scripts/Make.defs"
 echo "NXFLATLDFLAGS2   = ${NXFLATLDFLAGS2}" >>"${EXPORTDIR}/scripts/Make.defs"
 echo "OBJEXT           = ${OBJEXT}" >>"${EXPORTDIR}/scripts/Make.defs"