Merge pull request #2416 from jphickey:fix-2415-tblobj-extension

Fix #2415, use correct object extension in table build
nasa · Jul 27, 2023 · c99accc · c99accc
2 parents a8b20ac + 0900e5d
commit c99accc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/cmake/arch_build.cmake b/cmake/arch_build.cmake
@@ -312,6 +312,7 @@ function(add_cfe_tables TABLE_FQNAME TBL_DEFAULT_SRC_FILES)
  -DOUTPUT_FILE="${TABLE_RULEFILE}"
  -DTABLE_NAME="${TABLE_BASENAME}"
  -DSOURCES="${TBL_SRC}"
+ -DOBJEXT="${CMAKE_C_OUTPUT_EXTENSION}"
  -P "${TABLE_GENSCRIPT}"
  WORKING_DIRECTORY
  ${WORKING_DIRECTORY}

diff --git a/cmake/tables/elf2cfetbl_rules.mk b/cmake/tables/elf2cfetbl_rules.mk
@@ -1,5 +1,5 @@
 # Rule for traditional CFE table generation via elf2cfetbl
 
-elf/%.o:
+elf/%:
  @mkdir -pv $(dir $(@))
  cd $(dir $(@)) && $(AR) x $(abspath $(<)) $(notdir $(@))
diff --git a/cmake/tables/generate_elf_table_rules.cmake b/cmake/tables/generate_elf_table_rules.cmake
@@ -22,7 +22,7 @@ set(TABLE_RULES)
 foreach(TBL_SRC ${SOURCES})
 
  get_filename_component(DEP_FILE ${TBL_SRC} NAME)
- set(DEP_FILE "${TMP_DIR}/${DEP_FILE}.o")
+ set(DEP_FILE "${TMP_DIR}/${DEP_FILE}${OBJEXT}")
  string(APPEND TABLE_RULES
  "${DEP_FILE}: ${ARCHIVE_FILE}\n"
  "${TABLE_BINARY}: ${DEP_FILE}\n"