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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29517 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
index 12cbe0f3acd02fb7d6a7f9c8687b119001857c15..f8042333d87c43fbc5263a3f4e07bcf89751b9b7 100644 (file)
--- a/tools/llvm-config/Makefile
+++ b/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/tools/llvm-config/find-cycles.pl b/tools/llvm-config/find-cycles.pl
index 812eb96b7d8af983fb5ea9e4b4ebbd291ed12518..5f62034bb2a1f343cb39328519a0c1898ef0c92f 100755 (executable)
--- a/tools/llvm-config/find-cycles.pl
+++ b/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