Changes in directory llvm/tools/llvm-config:
Makefile updated: 1.11 -> 1.12
find-cycles.pl updated: 1.2 -> 1.3
---
Log message:
Make changes necessary for stopping the build if a cyclic library
dependency is found. The find-cycles.pl script now exits with a return code
that equals the number of cycles found. The Makefile was changed to ignore
the status code of find-cycles.pl. This should be removed once the libraries
are free of cyclic dependencies.
---
Diffs of the changes: (+4 -2)
Makefile | 2 +-
find-cycles.pl | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
Index: llvm/tools/llvm-config/Makefile
diff -u llvm/tools/llvm-config/Makefile:1.11
llvm/tools/llvm-config/Makefile:1.12
--- llvm/tools/llvm-config/Makefile:1.11 Thu Jul 6 19:46:18 2006
+++ llvm/tools/llvm-config/Makefile Wed Jul 26 12:10:54 2006
@@ -39,7 +39,7 @@
# don't have to process them at runtime.
$(FinalLibDeps): find-cycles.pl $(LibDeps)
$(Echo) "Finding cyclic dependencies between LLVM libraries."
- $(Verb) $(PERL) $< < $(LibDeps) > $@
+ -$(Verb) $(PERL) $< < $(LibDeps) > $@
# Rerun our configure substitutions as needed.
ConfigInIn = $(PROJ_SRC_DIR)/llvm-config.in.in
Index: llvm/tools/llvm-config/find-cycles.pl
diff -u llvm/tools/llvm-config/find-cycles.pl:1.2
llvm/tools/llvm-config/find-cycles.pl:1.3
--- llvm/tools/llvm-config/find-cycles.pl:1.2 Thu Mar 23 17:21:29 2006
+++ llvm/tools/llvm-config/find-cycles.pl Wed Jul 26 12:10:54 2006
@@ -40,6 +40,7 @@
# Print out the finished cycles, with their dependencies.
my @output;
+my $cycles_found = 0;
foreach my $cycle (@CYCLES) {
my @modules = sort keys %{$cycle};
@@ -57,6 +58,7 @@
# Warn about possible linker problems.
my @archives = grep(/\.a$/, @modules);
if (@archives > 1) {
+ $cycles_found = $cycles_found + 1;
print STDERR "find-cycles.pl: Circular dependency between *.a
files:\n";
print STDERR "find-cycles.pl: ", join(' ', @archives), "\n";
print STDERR "find-cycles.pl: Some linkers may have problems.\n";
@@ -68,7 +70,7 @@
join(' ', sort keys %dependencies) . "\n");
}
print sort @output;
-
+exit $cycles_found;
#==========================================================================
# Depedency Cycle Support
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
