From f636aa9c7e73c426bf5ddaec1c874e00fd4d2bf7 Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Wed, 1 Sep 2010 16:11:17 +0000
Subject: [PATCH] have the makefiles check the llvm-config error code instead
 of charging on an producing weird link errors.  Patch by Yuri Gribov!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112714 91177308-0d34-0410-b5e6-96231b3b80d8
---
 Makefile.rules              | 17 ++++++++++++++---
 lib/CompilerDriver/Makefile |  4 +++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Makefile.rules b/Makefile.rules
index b8375f26758..59fa834b4cc 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -917,9 +917,20 @@ endif
 LLVMLibsOptions += -lLLVM-$(LLVMVersion)
 LLVMLibsPaths += $(SharedLibDir)/$(SharedPrefix)LLVM-$(LLVMVersion)$(SHLIBEXT)
 else
-LLVMLibsOptions += $(shell $(LLVM_CONFIG) --libs     $(LINK_COMPONENTS))
-LLVMLibsPaths   += $(LLVM_CONFIG) \
-                   $(shell $(LLVM_CONFIG) --libfiles $(LINK_COMPONENTS))
+
+ifndef NO_LLVM_CONFIG
+LLVMConfigLibs := $(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS) || echo Error)
+ifeq ($(LLVMConfigLibs),Error)
+$(error llvm-config --libs failed)
+endif
+LLVMLibsOptions += $(LLVMConfigLibs)
+LLVMConfigLibfiles := $(shell $(LLVM_CONFIG) --libfiles $(LINK_COMPONENTS) || echo Error)
+ifeq ($(LLVMConfigLibfiles),Error)
+$(error llvm-config --libfiles failed)
+endif
+LLVMLibsPaths += $(LLVM_CONFIG) $(LLVMConfigLibfiles)
+endif
+
 endif
 endif
 endif
diff --git a/lib/CompilerDriver/Makefile b/lib/CompilerDriver/Makefile
index 69c3707780a..8e8b73ca8f8 100644
--- a/lib/CompilerDriver/Makefile
+++ b/lib/CompilerDriver/Makefile
@@ -10,9 +10,11 @@
 LEVEL = ../..
 
 # We don't want this library to appear in `llvm-config --libs` output, so its
-# name doesn't start with "LLVM".
+# name doesn't start with "LLVM" and NO_LLVM_CONFIG is set.
 
 LIBRARYNAME = CompilerDriver
 LINK_COMPONENTS = support system
+NO_LLVM_CONFIG = 1
+
 
 include $(LEVEL)/Makefile.common