From ecfe0888b6ca2cf543a8f4d1f6d1d9b9c7411f81 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 3 Aug 2006 21:46:42 +0000 Subject: [PATCH] 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 --- tools/llvm-config/Makefile | 2 +- tools/llvm-config/find-cycles.pl | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile index 12cbe0f3acd..f8042333d87 100644 --- 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 812eb96b7d8..5f62034bb2a 100755 --- 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