From 47a18158920dd0fe5c0368bb3729b66b1e71a9b1 Mon Sep 17 00:00:00 2001
From: David Nadlinger <code@klickverbot.at>
Date: Fri, 31 May 2013 22:31:38 +0200
Subject: [PATCH 1/3] Try llvm-config binaries with version suffix.

This allows us to pick up the newest available version on
several common Debian derivatives.

[Cherry-picked 2b4f49b4e from master.]
---
 cmake/Modules/FindLLVM.cmake | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cmake/Modules/FindLLVM.cmake b/cmake/Modules/FindLLVM.cmake
index d984fb97..4383fac5 100644
--- a/cmake/Modules/FindLLVM.cmake
+++ b/cmake/Modules/FindLLVM.cmake
@@ -22,7 +22,11 @@
 # Note: The variable names were chosen in conformance with the offical CMake
 # guidelines, see ${CMAKE_ROOT}/Modules/readme.txt.
 
-find_program(LLVM_CONFIG llvm-config ${LLVM_ROOT_DIR}/bin
+# Try suffixed versions to pick up the newest LLVM install available on Debian
+# derivatives.
+find_program(LLVM_CONFIG
+    NAMES llvm-config-3.3 llvm-config-3.2 llvm-config-3.1 llvm-config
+    PATHS ${LLVM_ROOT_DIR}/bin
     DOC "Path to llvm-config tool.")
 
 if (NOT LLVM_CONFIG)

From 5423a90c25184c0eee380544ed97f42bd85171e2 Mon Sep 17 00:00:00 2001
From: David Nadlinger <code@klickverbot.at>
Date: Wed, 5 Jun 2013 17:08:08 +0200
Subject: [PATCH 2/3] Search LLVM_ROOT_DIR before system directories.

---
 cmake/Modules/FindLLVM.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cmake/Modules/FindLLVM.cmake b/cmake/Modules/FindLLVM.cmake
index 4383fac5..72b389fb 100644
--- a/cmake/Modules/FindLLVM.cmake
+++ b/cmake/Modules/FindLLVM.cmake
@@ -24,10 +24,15 @@
 
 # Try suffixed versions to pick up the newest LLVM install available on Debian
 # derivatives.
+# We also want an user-specified LLVM_ROOT_DIR to take precedence over the
+# system default locations such as /usr/local/bin. Executing find_program()
+# multiples times is the approach recommended in the docs.
+set(llvm_config_names llvm-config-3.3 llvm-config-3.2 llvm-config-3.1 llvm-config)
 find_program(LLVM_CONFIG
-    NAMES llvm-config-3.3 llvm-config-3.2 llvm-config-3.1 llvm-config
-    PATHS ${LLVM_ROOT_DIR}/bin
+    NAMES ${llvm_config_names}
+    PATHS ${LLVM_ROOT_DIR}/bin NO_DEFAULT_PATH
     DOC "Path to llvm-config tool.")
+find_program(LLVM_CONFIG NAMES ${llvm_config_names})
 
 if (NOT LLVM_CONFIG)
     if (WIN32)

From c41ef6b95ec6c92e56e9f496b28ef5ad4a27cb3b Mon Sep 17 00:00:00 2001
From: David Nadlinger <code@klickverbot.at>
Date: Wed, 5 Jun 2013 17:46:40 +0200
Subject: [PATCH 3/3] Fold in MinGW Phobos test update.

---
 runtime/phobos | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/phobos b/runtime/phobos
index 3d7211fe..95181ab5 160000
--- a/runtime/phobos
+++ b/runtime/phobos
@@ -1 +1 @@
-Subproject commit 3d7211fedf3aff666d80e45e322e7cb63c87159b
+Subproject commit 95181ab5fd5d92350a4b2f65b62c8edc441df67c