maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Jason Molenda 2015-10-16 01:27:21 +00:00
parent 2a6150d932
commit 59e847f997
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lldb/scripts/build-llvm.pl
View File

@ -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