Skip to content

use target AR instead of host AR #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zbarnett wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

use target AR instead of host AR #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/add_cfe_tables_impl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/elf2cfetbl_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $(@))"
2 changes: 2 additions & 0 deletions scripts/table_rule_template.d.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Loading