For PR764:

Don't check in the LibDeps.txt and FinalLibDeps.txt files to CVS because
the content differs from platform to platform. Instead, adjust the makefile
so that a dummy llvm-config is built if Perl is not available.


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

3 files changed, 21 insertions, 65 deletions

diff --git a/tools/llvm-config/FinalLibDeps.txt b/tools/llvm-config/FinalLibDeps.txt
deleted file mode 100644
index 48131a6..0000000
--- a/tools/llvm-config/FinalLibDeps.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-LLVMAlpha.o: LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a
-LLVMAsmParser.o: LLVMCore.o
-LLVMBCReader.o: LLVMCore.o libLLVMSupport.a libLLVMSystem.a
-LLVMBCWriter.o: LLVMCore.o libLLVMSupport.a
-LLVMCBackend.o: LLVMCodeGen.o LLVMCore.o libLLVMAnalysis.a libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a libLLVMipa.a
-LLVMCodeGen.o LLVMSelectionDAG.o libLLVMAnalysis.a libLLVMTarget.a libLLVMTransformUtils.a libLLVMipa.a libLLVMAnalysis.a libLLVMTarget.a libLLVMTransformUtils.a libLLVMipa.a: LLVMCore.o libLLVMSupport.a libLLVMSystem.a
-LLVMCore.o: libLLVMSupport.a
-LLVMDataStructure.o: LLVMCore.o libLLVMAnalysis.a libLLVMSupport.a libLLVMTarget.a
-LLVMDebugger.o: LLVMBCReader.o LLVMCore.o libLLVMSupport.a libLLVMSystem.a
-LLVMExecutionEngine.o: LLVMCore.o libLLVMSupport.a libLLVMSystem.a libLLVMTarget.a
-LLVMIA64.o: LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a
-LLVMInterpreter.o: LLVMCore.o LLVMExecutionEngine.o libLLVMSupport.a libLLVMSystem.a libLLVMTarget.a
-LLVMJIT.o: LLVMCore.o LLVMExecutionEngine.o libLLVMSupport.a libLLVMSystem.a libLLVMTarget.a
-LLVMPowerPC.o: LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a
-LLVMSparc.o: LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a
-LLVMX86.o: LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a
-LLVMbzip2.o: 
-libLLVMArchive.a: LLVMBCReader.o LLVMCore.o libLLVMSupport.a libLLVMSystem.a
-libLLVMInstrumentation.a: LLVMCore.o libLLVMScalarOpts.a libLLVMSupport.a libLLVMTransformUtils.a
-libLLVMLinker.a: LLVMBCReader.o LLVMCore.o libLLVMArchive.a libLLVMSystem.a
-libLLVMScalarOpts.a: LLVMCore.o libLLVMAnalysis.a libLLVMSupport.a libLLVMTarget.a libLLVMTransformUtils.a
-libLLVMSupport.a: LLVMbzip2.o libLLVMSystem.a
-libLLVMSystem.a: 
-libLLVMTransforms.a: LLVMCore.o libLLVMSupport.a libLLVMTarget.a libLLVMTransformUtils.a
-libLLVMipo.a: LLVMCore.o libLLVMAnalysis.a libLLVMSupport.a libLLVMTarget.a libLLVMTransformUtils.a libLLVMipa.a
diff --git a/tools/llvm-config/LibDeps.txt b/tools/llvm-config/LibDeps.txt
deleted file mode 100644
index 0ca1450..0000000
--- a/tools/llvm-config/LibDeps.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-libLLVMAnalysis.a: libLLVMSupport.a libLLVMTarget.a LLVMCore.o
-libLLVMArchive.a: libLLVMSupport.a libLLVMSystem.a LLVMBCReader.o LLVMCore.o
-libLLVMInstrumentation.a: libLLVMScalarOpts.a libLLVMSupport.a libLLVMTransformUtils.a LLVMCore.o
-libLLVMipa.a: libLLVMAnalysis.a libLLVMSupport.a LLVMCore.o
-libLLVMipo.a: libLLVMAnalysis.a libLLVMipa.a libLLVMSupport.a libLLVMTarget.a libLLVMTransformUtils.a LLVMCore.o
-libLLVMLinker.a: libLLVMArchive.a libLLVMSystem.a LLVMBCReader.o LLVMCore.o
-libLLVMScalarOpts.a: libLLVMAnalysis.a libLLVMSupport.a libLLVMTarget.a libLLVMTransformUtils.a LLVMCore.o
-libLLVMSupport.a: libLLVMSystem.a LLVMbzip2.o
-libLLVMSystem.a:
-libLLVMTarget.a: libLLVMSupport.a LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o
-libLLVMTransforms.a: libLLVMSupport.a libLLVMTarget.a libLLVMTransformUtils.a LLVMCore.o
-libLLVMTransformUtils.a: libLLVMAnalysis.a libLLVMipa.a libLLVMSupport.a LLVMCore.o
-LLVMAlpha.o: libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o
-LLVMAsmParser.o: LLVMCore.o
-LLVMBCReader.o: libLLVMSupport.a libLLVMSystem.a LLVMCore.o
-LLVMBCWriter.o: libLLVMSupport.a LLVMCore.o
-LLVMbzip2.o:
-LLVMCBackend.o: libLLVMAnalysis.a libLLVMipa.a libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a LLVMCodeGen.o LLVMCore.o
-LLVMCodeGen.o: libLLVMAnalysis.a libLLVMSupport.a libLLVMTarget.a LLVMCore.o
-LLVMCore.o: libLLVMSupport.a
-LLVMDataStructure.o: libLLVMAnalysis.a libLLVMSupport.a libLLVMTarget.a LLVMCore.o
-LLVMDebugger.o: libLLVMSupport.a libLLVMSystem.a LLVMBCReader.o LLVMCore.o
-LLVMExecutionEngine.o: libLLVMSupport.a libLLVMSystem.a libLLVMTarget.a LLVMCore.o
-LLVMIA64.o: libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o
-LLVMInterpreter.o: libLLVMSupport.a libLLVMSystem.a libLLVMTarget.a LLVMCore.o LLVMExecutionEngine.o
-LLVMJIT.o: libLLVMSupport.a libLLVMSystem.a libLLVMTarget.a LLVMCore.o LLVMExecutionEngine.o
-LLVMPowerPC.o: libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o
-LLVMSelectionDAG.o: libLLVMSupport.a libLLVMSystem.a libLLVMTarget.a libLLVMTransformUtils.a LLVMCodeGen.o LLVMCore.o
-LLVMSparc.o: libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o
-LLVMX86.o: libLLVMScalarOpts.a libLLVMSupport.a libLLVMTarget.a LLVMCodeGen.o LLVMCore.o LLVMSelectionDAG.o
diff --git a/tools/llvm-config/Makefile b/tools/llvm-config/Makefile
index 81a0103..f4e4315 100644
--- a/tools/llvm-config/Makefile
+++ b/tools/llvm-config/Makefile
@@ -9,10 +9,15 @@
 
 LEVEL = ../..
 
-EXTRA_DIST = LibDeps.txt llvm-config.in.in find-cycles.pl
+EXTRA_DIST = LibDeps.txt FinalLibDeps.txt llvm-config.in.in find-cycles.pl
 
 include $(LEVEL)/Makefile.common
 
+# If we don't have Perl, we can't generate the library dependencies upon which 
+# llvm-config depends. Therefore, only if we detect perl will we do anything
+# useful.
+ifeq ($(HAVE_PERL),1)
+
 # Combine preprocessor flags (except for -I) and CXX flags.
 SUB_CXXFLAGS = ${CPP.BaseFlags} ${CXX.Flags}
 
@@ -21,10 +26,8 @@ SUB_CXXFLAGS = ${CPP.BaseFlags} ${CXX.Flags}
 # user to use libtool when linking against LLVM.
 SUB_LDFLAGS = 
 
-FinalLibDeps = $(PROJ_SRC_DIR)/FinalLibDeps.txt
-ifdef HAVE_PERL
-ifeq ($(HAVE_PERL),1)
-LibDeps = $(PROJ_SRC_DIR)/LibDeps.txt
+FinalLibDeps = $(PROJ_OBJ_DIR)/FinalLibDeps.txt
+LibDeps = $(PROJ_OBJ_DIR)/LibDeps.txt
 GenLibDeps = $(PROJ_SRC_ROOT)/utils/GenLibDeps.pl
 # MANUAL USE ONLY!  GenLibDeps.pl is very non-portable, so LibDeps.txt
 # should only be re-built manually.  No other rule in this file should
@@ -37,9 +40,7 @@ $(LibDeps): $(GenLibDeps) $(LibDir)
 # don't have to process them at runtime.
 $(FinalLibDeps): find-cycles.pl $(LibDeps)
 	$(Echo) "Finding cyclic dependencies between LLVM libraries."
-	$(Verb) $(PERL) $< < $(PROJ_SRC_DIR)/LibDeps.txt > $@
-endif
-endif
+	$(Verb) $(PERL) $< < $(LibDeps) > $@
 
 # Rerun our configure substitutions as needed.
 ConfigInIn = $(PROJ_SRC_DIR)/llvm-config.in.in
@@ -56,13 +57,23 @@ llvm-config: llvm-config.in $(FinalLibDeps)
 	$(Verb) $(SED) -f temp.sed < $< > $@
 	$(Verb) $(RM) temp.sed
 	$(Verb) cat $(FinalLibDeps) >> $@
-	$(Verb) chmod +x llvm-config
+	$(Verb) chmod +x $@
+
+else
+# We don't have perl, just generate a dummy llvm-config
+llvm-config:
+	$(Echo) "Building place holder llvm-config script."
+	$(Verb) $(ECHO) 'echo llvm-config: Perl not found so llvm-config could not be generated' >> $@
+	$(Verb) chmod +x $@
 
+endif
 # Hook into the standard Makefile rules.
 all-local:: llvm-config
 clean-local::
-	$(Verb) $(RM) -f llvm-config llvm-config.in
+	$(Verb) $(RM) -f llvm-config llvm-config.in $(FinalLibDeps) $(LibDeps) \
+	  GenLibDeps.out
 install-local:: all-local
 	$(Echo) Installing llvm-config
 	$(Verb) $(MKDIR) $(PROJ_bindir)
 	$(Verb) $(ScriptInstall) llvm-config $(PROJ_bindir)
+