summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2006-08-03 21:46:42 +0000
committerReid Spencer <rspencer@reidspencer.com>2006-08-03 21:46:42 +0000
commita5c3483f7db71a90a840cd3d10c69f96a99e119a (patch)
tree748cbf7bed14d8fa6ee0ce505788794ebf098753
parentc45a6e40bdae30e8847fab50482cea5518326232 (diff)
downloadbcm5719-llvm-a5c3483f7db71a90a840cd3d10c69f96a99e119a.tar.gz
bcm5719-llvm-a5c3483f7db71a90a840cd3d10c69f96a99e119a.zip
For PR845:
Enable the makefile check on the result of find-cycles.pl. LLVM is now cycle free and we intend to keep it that way. This patch will fail the build if cycles are found. llvm-svn: 29517
-rw-r--r--llvm/tools/llvm-config/Makefile2
-rwxr-xr-xllvm/tools/llvm-config/find-cycles.pl4
2 files changed, 2 insertions, 4 deletions
diff --git a/llvm/tools/llvm-config/Makefile b/llvm/tools/llvm-config/Makefile
index 12cbe0f3acd..f8042333d87 100644
--- a/llvm/tools/llvm-config/Makefile
+++ b/llvm/tools/llvm-config/Makefile
@@ -39,7 +39,7 @@ $(LibDeps): $(GenLibDeps) $(LibDir) $(wildcard $(LibDir)/*.a $(LibDir)/*.o)
# 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
diff --git a/llvm/tools/llvm-config/find-cycles.pl b/llvm/tools/llvm-config/find-cycles.pl
index 812eb96b7d8..5f62034bb2a 100755
--- a/llvm/tools/llvm-config/find-cycles.pl
+++ b/llvm/tools/llvm-config/find-cycles.pl
@@ -71,9 +71,7 @@ foreach my $cycle (@CYCLES) {
}
print sort @output;
-### FIXME: reenable this after 1.8.
-#exit $cycles_found;
-exit 0;
+exit $cycles_found;
#==========================================================================
# Depedency Cycle Support
OpenPOWER on IntegriCloud