Yep, what Stephane said. On Wed, Jul 27, 2016 at 5:16 PM, Stephane Sezer <s...@fb.com> wrote:
> Hey Hans, > > Yes, `scripts/Xcode/build-llvm.py` is the script that needs to be updated > now. You can ignore `build-lldb-llvm-clang`. > > > > On Jul 27, 2016, at 5:07 PM, Francis Ricci <francisjri...@gmail.com> > wrote: > > > > Stephane can look at this, CC-ing here > > > > On Wed, Jul 27, 2016 at 8:25 PM Hans Wennborg <h...@chromium.org> wrote: > > I tried to figure out what to do here for the 3.9 branch. It seems > > scripts/build-llvm.pl has moved to scripts/Xcode/build-llvm.py. Should > > I update that instead? > > > > There's also scripts/build-lldb-llvm-clang. Should that be updated > > too? I don't think it was for previous branches? > > > > Thanks, > > Hans > > > > On Thu, May 19, 2016 at 7:31 AM, Francis Ricci via llvm-branch-commits > > <llvm-branch-commits@lists.llvm.org> wrote: > > > Author: fjricci > > > Date: Thu May 19 09:31:00 2016 > > > New Revision: 270065 > > > > > > URL: http://llvm.org/viewvc/llvm-project?rev=270065&view=rev > > > Log: > > > Checkout release_38 branches of llvm and clang when building lldb 3.8 > > > > > > Summary: > > > This commit is intended only for the release_38 branch, not for master. > > > > > > Fixes xcodebuild for the release_38 branch, since llvm and clang must > > > be on the same branch as lldb when building. > > > > > > Reviewers: jasonmolenda, sas, clayborg > > > > > > Subscribers: tstellarAMD, lldb-commits, sas, hans > > > > > > Differential Revision: http://reviews.llvm.org/D19608 > > > > > > Modified: > > > lldb/branches/release_38/scripts/build-llvm.pl > > > > > > Modified: lldb/branches/release_38/scripts/build-llvm.pl > > > URL: > http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/scripts/build-llvm.pl?rev=270065&r1=270064&r2=270065&view=diff > > > > ============================================================================== > > > --- lldb/branches/release_38/scripts/build-llvm.pl (original) > > > +++ lldb/branches/release_38/scripts/build-llvm.pl Thu May 19 > 09:31:00 2016 > > > @@ -22,10 +22,6 @@ our $archive_filelist_file = $ENV{SCRIPT > > > > > > our $llvm_configuration = $ENV{LLVM_CONFIGURATION}; > > > > > > -our $llvm_revision = "HEAD"; > > > -our $clang_revision = "HEAD"; > > > -our $compiler_rt_revision = "HEAD"; > > > - > > > our $SRCROOT = "$ENV{SRCROOT}"; > > > our @archs = split (/\s+/, $ENV{ARCHS}); > > > my $os_release = 11; > > > @@ -64,12 +60,12 @@ if (-e "$llvm_srcroot/lib") > > > } > > > else > > > { > > > - print "Checking out llvm sources from revision > $llvm_revision...\n"; > > > - 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 llvm sources from release_38...\n"; > > > + do_command ("cd '$SRCROOT' && svn co --quiet > http://llvm.org/svn/llvm-project/llvm/branches/release_38 llvm", > "checking out llvm from repository", 1); > > > + print "Checking out clang sources from release_38...\n"; > > > + do_command ("cd '$llvm_srcroot/tools' && svn co --quiet > http://llvm.org/svn/llvm-project/cfe/branches/release_38 clang", > "checking out clang from repository", 1); > > > +# print "Checking out compiler-rt sources from release_38...\n"; > > > +# do_command ("cd '$llvm_srcroot/projects' && svn co --quiet > http://llvm.org/svn/llvm-project/compiler-rt/branches/release_38 > 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"); > > > > > > > > > _______________________________________________ > > > llvm-branch-commits mailing list > > > llvm-branch-commits@lists.llvm.org > > > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits > > -- -Todd
_______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
