From 8bca46615263bd4e276e3d0bc7e2f915e761c9eb Mon Sep 17 00:00:00 2001
From: "Barnett, Zebulun" <zebulun.d.barnett@nasa.gov>
Date: Thu, 30 Apr 2026 21:36:19 -0500
Subject: [PATCH] use target AR instead of host AR

---
 scripts/add_cfe_tables_impl.cmake | 1 +
 scripts/elf2cfetbl_rules.mk       | 2 +-
 scripts/table_rule_template.d.in  | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/add_cfe_tables_impl.cmake b/scripts/add_cfe_tables_impl.cmake
index 1dea944..ad5a810 100644
--- a/scripts/add_cfe_tables_impl.cmake
+++ b/scripts/add_cfe_tables_impl.cmake
@@ -115,6 +115,7 @@ function(do_add_cfe_tables_impl TABLE_FQNAME)
                 -DTABLE_NAME="${TABLE_BASENAME}"
                 -DSOURCES="${TBL_SRC}"
                 -DOBJEXT="${CMAKE_C_OUTPUT_EXTENSION}"
+                -DARCH_AR="${CMAKE_AR}"
                 -P "${TABLE_GENSCRIPT}"
             WORKING_DIRECTORY
                 ${MISSION_BINARY_DIR}/tables
diff --git a/scripts/elf2cfetbl_rules.mk b/scripts/elf2cfetbl_rules.mk
index c174435..80f745c 100644
--- a/scripts/elf2cfetbl_rules.mk
+++ b/scripts/elf2cfetbl_rules.mk
@@ -7,4 +7,4 @@
 # into a separate dir, in case of similarly-named files on different cpus.
 elf/%:
 	@mkdir -pv "$(dir $(@))"
-	cd "$(dir $(@))" && $(AR) x "$(<)" "$(notdir $(@))"
+	cd "$(dir $(@))" && $(ARCH_AR) x "$(<)" "$(notdir $(@))"
diff --git a/scripts/table_rule_template.d.in b/scripts/table_rule_template.d.in
index e3c70af..6896f0d 100644
--- a/scripts/table_rule_template.d.in
+++ b/scripts/table_rule_template.d.in
@@ -8,5 +8,7 @@ ${TABLE_BINARY}: CFE_TABLE_CPUNAME   := ${TARGET_NAME}
 ${TABLE_BINARY}: CFE_TABLE_APPNAME   := ${APP_NAME}
 ${TABLE_BINARY}: CFE_TABLE_BASENAME  := ${TABLE_NAME}
 
+ARCH_AR := @ARCH_AR@
+
 # Rules to build ${TABLE_BINARY}
 ${TABLE_RULES}