sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

Be a little bit less strict about recursive dependencies.

Browse Source 
(This used to be commit 0bb89968299f90df00861a8982eefca182ed7f8d)
This commit is contained in:
Jelmer Vernooij 2008-02-18 19:19:54 +01:00
parent 602f4635da
commit c5487903df
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source4/build/smb_build/input.pm
View File

@ -202,9 +202,12 @@ sub calc_unique_deps($$$$$$$$)
foreach my $n (@$deps) { foreach my $n (@$deps) {
add_implicit($INPUT, $n) unless (defined($INPUT->{$n})); add_implicit($INPUT, $n) unless (defined($INPUT->{$n}));
die("Recursive dependency: $n, list: " . join(',', @$busy)) if (grep (/^$n$/, @$busy));
next if (grep /^$n$/, @$udeps);
my $dep = $INPUT->{$n}; my $dep = $INPUT->{$n};
if (grep (/^$n$/, @$busy)) {
next if (@{$dep->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ");
die("Recursive dependency: $n, list: " . join(',', @$busy));
}
next if (grep /^$n$/, @$udeps);
push (@{$udeps}, $dep->{NAME}) if $forward; push (@{$udeps}, $dep->{NAME}) if $forward;