coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-23 16:42:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

update/trees: avoid namespace clash in function

Browse Source 
the logic of the previous commit was correct, but one
of the functions was named the same as another function
used in this file, causing a namespace conflict, and
a build error

Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2023-12-30 16:46:49 +00:00
parent b061558104
commit 30337b8fa5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/update/trees
+4 -4
View File
@@ -49,7 +49,7 @@ build_projects()
[ $# -gt 0 ] && x_ ./update trees $_f $@ [ $# -gt 0 ] && x_ ./update trees $_f $@
[ "$mode" = "fetch" ] && eval "fetch_project_repo; return 0;" [ "$mode" = "fetch" ] && eval "fetch_project_repo; return 0;"
load_target_config "$cfgsdir" load_project_config "$cfgsdir"
codedir="src/${project}" codedir="src/${project}"
[ -d "$codedir" ] || x_ ./update trees -f "$project" [ -d "$codedir" ] || x_ ./update trees -f "$project"
@@ -130,7 +130,7 @@ handle_src_tree()
target_dir="${cfgsdir}/${target}" target_dir="${cfgsdir}/${target}"
[ "$mode" = "fetch" ] && eval "fetch_project_trees; return 1;" [ "$mode" = "fetch" ] && eval "fetch_project_trees; return 1;"
load_target_config "$target_dir" load_project_config "$target_dir"
x_ mkdir -p "${elfdir}/${target}" x_ mkdir -p "${elfdir}/${target}"
@@ -152,13 +152,13 @@ handle_src_tree()
[ -z "$mode" ] && check_cross_compiler; return 0 [ -z "$mode" ] && check_cross_compiler; return 0
} }
load_target_config() load_project_config()
{ {
eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs)" eval "$(setvars "" xarch xlang tree bootstrapargs autoconfargs)"
[ -f "${1}/target.cfg" ] || return 0 [ -f "${1}/target.cfg" ] || return 0
. "${1}/target.cfg" || \ . "${1}/target.cfg" || \
err "load_target_config ${1}: cannot load target.cfg"; return 0 err "load_project_config ${1}: cannot load target.cfg"; return 0
} }
check_cross_compiler() check_cross_compiler()