From 59e847f997a4494c695c89068c4db34fb36de3ab Mon Sep 17 00:00:00 2001
From: Jason Molenda <jmolenda@apple.com>
Date: Fri, 16 Oct 2015 01:27:21 +0000
Subject: [PATCH] I've been seeing a problem with xcodebuilds on macosx for a
 few days now where compiler-rt gets an error when trying to run its install
 step (related to not being able to find an ios version of a dylib), breaking
 the lldb build.  I don't know if I'm the only one seeing this or if everyone
 has been doing the same hack I've been doing - removing the compiler-rt
 project from the default checkout.

It's only used for the ASAN test case.  So I'm temporarily
checking in my hackaround of not checking out compiler-rt
by default, I'll try to get back and look at what's actually
happening in the compiler-rt install step that is causing
the problems when built as a part of lldb.

llvm-svn: 250487
---
 lldb/scripts/build-llvm.pl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lldb/scripts/build-llvm.pl b/lldb/scripts/build-llvm.pl
index 43e075c96645..f7a60d8d3d3e 100644
--- a/lldb/scripts/build-llvm.pl
+++ b/lldb/scripts/build-llvm.pl
@@ -54,7 +54,7 @@ else
 our @llvm_repositories = (
     abs_path("$llvm_srcroot"),
     abs_path("$llvm_srcroot/tools/clang"),
-    abs_path("$llvm_srcroot/projects/compiler-rt")
+#    abs_path("$llvm_srcroot/projects/compiler-rt")
 );
 
 if (-e "$llvm_srcroot/lib")
@@ -68,8 +68,8 @@ else
     do_command ("cd '$SRCROOT' && svn co --quiet --revision $llvm_revision http://llvm.org/svn/llvm-project/llvm/trunk llvm", "checking out llvm from repository", 1);
     print "Checking out clang sources from revision $clang_revision...\n";
     do_command ("cd '$llvm_srcroot/tools' && svn co --quiet --revision $clang_revision http://llvm.org/svn/llvm-project/cfe/trunk clang", "checking out clang from repository", 1);
-    print "Checking out compiler-rt sources from revision $compiler_rt_revision...\n";
-    do_command ("cd '$llvm_srcroot/projects' && svn co --quiet --revision $compiler_rt_revision http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt", "checking out compiler-rt from repository", 1);
+#    print "Checking out compiler-rt sources from revision $compiler_rt_revision...\n";
+#    do_command ("cd '$llvm_srcroot/projects' && svn co --quiet --revision $compiler_rt_revision http://llvm.org/svn/llvm-project/compiler-rt/trunk compiler-rt", "checking out compiler-rt from repository", 1);
     print "Applying any local patches to LLVM/Clang...";
 
     my @llvm_patches = bsd_glob("$ENV{SRCROOT}/scripts/llvm.*.diff");
@@ -84,11 +84,11 @@ else
         do_command ("cd '$llvm_srcroot/tools/clang' && patch -p0 < $patch");
     }
 
-    my @compiler_rt_patches = bsd_glob("$ENV{SRCROOT}/scripts/compiler-rt.*.diff");
-    foreach my $patch (@compiler_rt_patches)
-    {
-        do_command ("cd '$llvm_srcroot/projects/compiler-rt' && patch -p0 < $patch");
-    }
+#    my @compiler_rt_patches = bsd_glob("$ENV{SRCROOT}/scripts/compiler-rt.*.diff");
+#    foreach my $patch (@compiler_rt_patches)
+#    {
+#        do_command ("cd '$llvm_srcroot/projects/compiler-rt' && patch -p0 < $patch");
+#    }
 }
 
 # Get our options