From 5e0757f0ba367061be31c2b0ccb705ad0286578c Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Sat, 10 Jul 2010 19:58:02 -0700
Subject: [PATCH] Disable llvm-config logic due to optimistic assumption of
 "having the ocaml bindings". Also add NO_LLVM override make-var, for good
 measure.

---
 src/Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index 256737a2560..15bce37e4b4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,7 +23,11 @@ CFG_GCC_CFLAGS :=
 CFG_GCC_LINK_FLAGS :=
 CFG_VALGRIND :=
 
-CFG_LLVM_CONFIG := llvm-config
+# Issue #102, LLVM-config logic is assuming "presence of llvm-config"
+# means "presence of ocaml bindings". Commenting out for now.
+# CFG_LLVM_CONFIG := llvm-config
+
+CFG_LLVM_CONFIG :=
 CFG_BOOT_FLAGS := $(FLAGS)
 
 ifeq ($(CFG_OSTYPE), Linux)
@@ -150,6 +154,10 @@ ifdef NO_VALGRIND
     CFG_VALGRIND :=
 endif
 
+ifdef NO_LLVM
+    CFG_LLVM_CONFIG :=
+endif
+
 ifneq ($(CFG_LLVM_CONFIG),)
   CFG_LLVM_CONFIG := $(shell which $(CFG_LLVM_CONFIG))
 endif