diff options
| -rw-r--r-- | include/git.sh | 4 | ||||
| -rwxr-xr-x | mk | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/include/git.sh b/include/git.sh index 9712ed37..272a1af3 100644 --- a/include/git.sh +++ b/include/git.sh @@ -9,8 +9,6 @@ tmpgit="$xbmkpwd/tmp/gitclone" fetch_targets() { - [ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \ - x_ ./mk -f "$project" "$tree_depend" e "src/$project/$tree" d && return 0 printf "Creating %s tree %s\n" "$project" "$tree" @@ -21,7 +19,7 @@ fetch_targets() fetch_project() { - eval "`setvars "" xtree tree_depend`" + eval "`setvars "" xtree`" eval "`setcfg "config/git/$project/pkg.cfg"`" chkvars url @@ -116,9 +116,9 @@ main "$@" && exit 0 eval "`setvars "" xarch srcdir premake gnatdir xlang mode makeargs elfdir cmd \ project target target_dir targets xtree _f release bootstrapargs mkhelper \ - autoconfargs listfile autogenargs btype tree rev tree_depend build_depend \ + autoconfargs listfile autogenargs btype rev build_depend gccdir cmakedir \ defconfig postmake mkhelpercfg dry dest_dir mdir cleanargs gccver gccfull \ - gnatver gnatfull gccdir cmakedir do_make badhash`" + gnatver gnatfull do_make badhash tree`" trees() { @@ -241,8 +241,8 @@ handle_defconfig() configure_project() { eval "`setvars "" cleanargs build_depend autoconfargs xtree postmake \ - tree_depend makeargs btype mkhelper bootstrapargs premake release \ - xarch xlang badhash`" + makeargs btype mkhelper bootstrapargs premake release xlang xarch \ + badhash`" _tcfg="$1/target.cfg" [ -f "$_tcfg" ] || btype="auto" e "$datadir/mkhelper.cfg" f && eval "`setcfg "$datadir/mkhelper.cfg"`" |