|
|
|
@@ -617,7 +617,6 @@ check_deps(){ |
|
|
|
enabled ${cfg}_checking && die "Circular dependency for $cfg." |
|
|
|
disabled ${cfg}_checking && continue |
|
|
|
enable ${cfg}_checking |
|
|
|
append allopts $cfg |
|
|
|
|
|
|
|
eval dep_all="\$${cfg}_deps" |
|
|
|
eval dep_any="\$${cfg}_deps_any" |
|
|
|
@@ -638,15 +637,13 @@ check_deps(){ |
|
|
|
disabled_all $dep_con || disable $cfg |
|
|
|
disabled_any $dep_sel && disable $cfg |
|
|
|
|
|
|
|
if enabled $cfg; then |
|
|
|
enable_deep $dep_sel |
|
|
|
enable_deep_weak $dep_sgs |
|
|
|
for dep in $dep_all $dep_any $dep_sgs; do |
|
|
|
# filter out library deps, these do not belong in extralibs |
|
|
|
is_in $dep $LIBRARY_LIST && continue |
|
|
|
enabled $dep && eval append ${cfg}_extralibs ${dep}_extralibs |
|
|
|
done |
|
|
|
fi |
|
|
|
enabled $cfg && enable_deep_weak $dep_sel $dep_sgs |
|
|
|
|
|
|
|
for dep in $dep_all $dep_any $dep_sel $dep_sgs; do |
|
|
|
# filter out library deps, these do not belong in extralibs |
|
|
|
is_in $dep $LIBRARY_LIST && continue |
|
|
|
enabled $dep && eval append ${cfg}_extralibs ${dep}_extralibs |
|
|
|
done |
|
|
|
|
|
|
|
disable ${cfg}_checking |
|
|
|
done |
|
|
|
|