From 52ce7bafe280ad11c40955e58627f4492c99540e Mon Sep 17 00:00:00 2001
From: Ray Donnelly <mingw.android@gmail.com>
Date: Thu, 4 Sep 2014 21:13:05 +0100
Subject: [PATCH] darwin: Update to LLVM/Clang 3.4

---
 samples/i686-apple-darwin11/crosstool.config  |  4 ++--
 .../x86_64-apple-darwin10/crosstool.config    | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/samples/i686-apple-darwin11/crosstool.config b/samples/i686-apple-darwin11/crosstool.config
index 03e04e82..e4eaf4ef 100644
--- a/samples/i686-apple-darwin11/crosstool.config
+++ b/samples/i686-apple-darwin11/crosstool.config
@@ -5,7 +5,7 @@ CT_SAVE_TARBALLS=y
 CT_LOG_EXTRA=y
 CT_ARCH_x86=y
 CT_MULTILIB=y
-CT_LLVM_V_3_3=y
+CT_LLVM_V_3_4=y
 # llvmgcc needs an older version of LLVM (2.7)
 # such as the one that comes in Apples tarball
 # Disabled until - maybe never! - we get round
@@ -36,4 +36,4 @@ CT_DARWIN_COPY_SDK_TO_SYSROOT=n
 # because touch on Mac doesn't support --date=
 CT_SRC_REFERENCE_DATETIME="199912312359.59"
 # While there's a need to debug
-CT_DEBUGGABLE_TOOLCHAIN=y
+CT_DEBUGGABLE_TOOLCHAIN=n
diff --git a/samples/x86_64-apple-darwin10/crosstool.config b/samples/x86_64-apple-darwin10/crosstool.config
index 13f8acdc..962f10ee 100644
--- a/samples/x86_64-apple-darwin10/crosstool.config
+++ b/samples/x86_64-apple-darwin10/crosstool.config
@@ -1,11 +1,19 @@
 CT_EXPERIMENTAL=y
+CT_STATIC_TOOLCHAIN=n
 CT_LOCAL_TARBALLS_DIR="${HOME}/src"
 CT_SAVE_TARBALLS=y
 CT_LOG_EXTRA=y
 CT_ARCH_64=y
 CT_ARCH_x86=y
 CT_MULTILIB=y
-CT_LLVM_V_2_7=y
+CT_LLVM_V_3_4=y
+# llvmgcc needs an older version of LLVM (2.7)
+# such as the one that comes in Apples tarball
+# Disabled until - maybe never! - we get round
+# to allowing two different LLVM builds.
+CT_CC_llvmgcc=n
+CT_CC_LLVMGCC_V_2336_11=y
+CT_LLVM_COMPILER_RT=n
 CT_TARGET_VENDOR="apple"
 CT_KERNEL_darwin=y
 CT_DARWIN_MAC_OSX_V_10_6=y
@@ -20,3 +28,12 @@ CT_CC_LANG_CXX=y
 CT_CC_LANG_OBJC=y
 CT_CC_LANG_OBJCXX=y
 CT_LIBC_none=y
+CT_EXPORT_BUILD_TOOLS=y
+# Clang is currently broken without this!
+# It doesn't look in -isysroot folder ...
+CT_DARWIN_COPY_SDK_TO_SYSROOT=n
+# For repeatable builds, must be the -t format
+# because touch on Mac doesn't support --date=
+CT_SRC_REFERENCE_DATETIME="199912312359.59"
+# While there's a need to debug
+CT_DEBUGGABLE_TOOLCHAIN=n