diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 19:19:54 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 19:19:54 +0100 |
| commit | c5487903df0f770600d0e96bfb26e00f8254c82f (patch) | |
| tree | 191c5323866e4ff7600e24fd1408b0f6cb953b1c | |
| parent | 602f4635da0935abffdda2a29ec302a775fdbe62 (diff) | |
| download | samba-c5487903df0f770600d0e96bfb26e00f8254c82f.tar.gz samba-c5487903df0f770600d0e96bfb26e00f8254c82f.tar.bz2 samba-c5487903df0f770600d0e96bfb26e00f8254c82f.zip | |
Be a little bit less strict about recursive dependencies.
(This used to be commit 0bb89968299f90df00861a8982eefca182ed7f8d)
| -rw-r--r-- | source4/build/smb_build/input.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index 9cc374fa79..d636ecc898 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -202,9 +202,12 @@ sub calc_unique_deps($$$$$$$$) foreach my $n (@$deps) { 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}; + 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; |