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