From 6ba5955435426bb2c0cf2a1305f5547f36bbd8b7 Mon Sep 17 00:00:00 2001
From: Huang Qi <huangqi3@xiaomi.com>
Date: Sun, 26 Jan 2025 14:18:17 +0800
Subject: [PATCH] tools: Export ZIG/ZIGFLAGS in Export.mk instead

Summary:
- Moved the export of `ZIG` and `ZIGFLAGS` from `tools/Unix.mk` to `tools/Export.mk`
- Simplified the `export` target in `tools/Unix.mk` by removing redundant `ZIG` and `ZIGFLAGS` variables

Impact:
- No functional changes - the `ZIG` and `ZIGFLAGS` variables are still exported correctly
- Improves code maintainability by centralizing environment variable exports in `Export.mk`

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
---
 tools/Export.mk | 2 ++
 tools/Unix.mk   | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/Export.mk b/tools/Export.mk
index 528820f597..e1a6a14649 100644
--- a/tools/Export.mk
+++ b/tools/Export.mk
@@ -80,6 +80,8 @@ endif
 	@echo "NXFLATLDFLAGS2=\"$(NXFLATLDFLAGS2)\"" >> $(EXPORTDIR)/makeinfo.sh
 	@echo "OBJCOPY=\"$(OBJCOPY)\"" >> $(EXPORTDIR)/makeinfo.sh
 	@echo "OBJDUMP=\"$(OBJDUMP)\"" >> $(EXPORTDIR)/makeinfo.sh
+	@echo "ZIG=\"$(ZIG)\"" >> $(EXPORTDIR)/makeinfo.sh
+	@echo "ZIGFLAGS=\"$(ZIGFLAGS)\"" >> $(EXPORTDIR)/makeinfo.sh
 	@echo "OBJEXT=\"$(OBJEXT)\"" >> $(EXPORTDIR)/makeinfo.sh
 	@echo "STRIP=\"$(STRIP)\"" >> $(EXPORTDIR)/makeinfo.sh
 	@echo "NUTTX_ARCH=\"$(CONFIG_ARCH)\"" >> $(EXPORTDIR)/makeinfo.sh
diff --git a/tools/Unix.mk b/tools/Unix.mk
index 8a090e6fc5..c497678063 100644
--- a/tools/Unix.mk
+++ b/tools/Unix.mk
@@ -777,8 +777,7 @@ savedefconfig: apps_preconfig
 # that the archiver is 'ar'
 
 export: $(NUTTXLIBS)
-	$(Q) ZIG="${ZIG}" ZIGFLAGS="${ZIGFLAGS}" MAKE="${MAKE}" \
-		$(MKEXPORT) $(MKEXPORT_ARGS) -l "$(EXPORTLIBS)"
+	$(Q) MAKE="${MAKE}" $(MKEXPORT) $(MKEXPORT_ARGS) -l "$(EXPORTLIBS)"
 
 # General housekeeping targets:  dependencies, cleaning, etc.
 #