Thanks! > On Jul 28, 2016, at 8:54 AM, Hans Wennborg <h...@chromium.org> wrote: > > Thanks! I've committed > https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.llvm.org_pipermail_llvm-2Dbranch-2Dcommits_2016-2DJuly_010248.html&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=6AfuT4n4YTDDjlIW4_I4ZFATqwhwAGg6exl9q990L8Y&e= > > > Cheers, > Hans > > On Wed, Jul 27, 2016 at 7:52 PM, Todd Fiala <todd.fi...@gmail.com> wrote: >> 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: >>>>> https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject-3Frev-3D270065-26view-3Drev&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=UPLOYtztTAsNsE8o4xE7T2IONsEUaQVAGNjEdIe5rzY&e= >>>>> >>>>> 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: >>>>> https://urldefense.proofpoint.com/v2/url?u=http-3A__reviews.llvm.org_D19608&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=m9_3GS1TL1UEGYVm2wTlZy7w8PCiD6NAeODyLJ2aFf8&e= >>>>> >>>>> >>>>> Modified: >>>>> lldb/branches/release_38/scripts/build-llvm.pl >>>>> >>>>> Modified: lldb/branches/release_38/scripts/build-llvm.pl >>>>> URL: >>>>> https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_viewvc_llvm-2Dproject_lldb_branches_release-5F38_scripts_build-2Dllvm.pl-3Frev-3D270065-26r1-3D270064-26r2-3D270065-26view-3Ddiff&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=RH8sv7qkAgf8O91Lt0gEFm7c30ad0kig5_ZTlCooP8U&e= >>>>> >>>>> >>>>> ============================================================================== >>>>> --- 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 >>>>> https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_svn_llvm-2Dproject_llvm_trunk&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=J6lJexEtuz-Z8sbrDX64gtAdw1LIMN7-IhECk4NmkO8&e= >>>>> 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 >>>>> https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_svn_llvm-2Dproject_cfe_trunk&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=65bVQoiWvA3NCjDEgx4PO9SSJ7hji2SOAAD8JR22cjs&e= >>>>> >>>>> 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 >>>>> https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_svn_llvm-2Dproject_compiler-2Drt_trunk&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=IhWzICBI38cPXyQ8xGiEeR5PcBp4ZJKxbQbdaT6sQXs&e= >>>>> 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 >>>>> https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_svn_llvm-2Dproject_llvm_branches_release-5F38&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=JkTfx6FG5Wn3B1pPvSJB7af0h2ScVUkyXRKHtXoYp1I&e= >>>>> 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 >>>>> https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_svn_llvm-2Dproject_cfe_branches_release-5F38&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=txivKwWBBpxUHbntKxirRWRR00NCBxbldgG31b-yIfE&e= >>>>> 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 >>>>> https://urldefense.proofpoint.com/v2/url?u=http-3A__llvm.org_svn_llvm-2Dproject_compiler-2Drt_branches_release-5F38&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=HpimjgnFXQWbEqYgp_6b9CgO5rzTyOhCPvtGBP03R0Q&e= >>>>> >>>>> 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 >>>>> https://urldefense.proofpoint.com/v2/url?u=http-3A__lists.llvm.org_cgi-2Dbin_mailman_listinfo_llvm-2Dbranch-2Dcommits&d=CwIBaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=zTo4_G7o7BiHqh4aItULRg&m=9akx-P7i0kEiricd02XwoduY21OOp-DiI6eEuHgjw0M&s=gn4pOSkYSkQzYY7frj1cpjUidCP9MQni7o4RNmpNSI8&e= >>>>> >>> >> >> >> >> -- >> -Todd
_______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
