diff --git a/tools/clang/scripts/package.py b/tools/clang/scripts/package.py index d320530..635634df 100755 --- a/tools/clang/scripts/package.py +++ b/tools/clang/scripts/package.py
@@ -507,29 +507,8 @@ filter=PrintTarProgress) MaybeUpload(args.upload, clang_tidy_dir + '.tgz', gcs_platform) - # On Mac, lld wasn't part of the main zip. Upload it in a separate zip - # until everything uses the version in the default package. if sys.platform == 'darwin': - llddir = 'lld-' + stamp - shutil.rmtree(llddir, ignore_errors=True) - os.makedirs(os.path.join(llddir, 'bin')) - shutil.copy(os.path.join(LLVM_RELEASE_DIR, 'bin', 'lld'), - os.path.join(llddir, 'bin')) - shutil.copy(os.path.join(LLVM_RELEASE_DIR, 'bin', 'llvm-ar'), - os.path.join(llddir, 'bin')) - shutil.copy(os.path.join(LLVM_RELEASE_DIR, 'bin', 'llvm-objcopy'), - os.path.join(llddir, 'bin')) - os.symlink('lld', os.path.join(llddir, 'bin', 'ld.lld')) - os.symlink('lld', os.path.join(llddir, 'bin', 'ld64.lld')) - os.symlink('lld', os.path.join(llddir, 'bin', 'lld-link')) - os.symlink('lld', os.path.join(llddir, 'bin', 'wasm-ld')) - os.symlink('llvm-objcopy', os.path.join(llddir, 'bin', 'llvm-strip')) - with tarfile.open(llddir + '.tgz', 'w:gz') as tar: - tar.add(os.path.join(llddir, 'bin'), arcname='bin', - filter=PrintTarProgress) - MaybeUpload(args.upload, llddir + '.tgz', gcs_platform) - - # dsymutil isn't part of the main zip either, and it gets periodically + # dsymutil isn't part of the main zip, and it gets periodically # deployed to CIPD (manually, not as part of clang rolls) for use in the # Mac build toolchain. dsymdir = 'dsymutil-' + stamp
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py index 4d5289c..45019e9 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py
@@ -39,8 +39,8 @@ # https://chromium.googlesource.com/chromium/src/+/main/docs/updating_clang.md # Reverting problematic clang rolls is safe, though. # This is the output of `git describe` and is usable as a commit-ish. -CLANG_REVISION = 'llvmorg-13-init-15040-gc10947b5' -CLANG_SUB_REVISION = 1 +CLANG_REVISION = 'llvmorg-13-init-14732-g8a7b5ebf' +CLANG_SUB_REVISION = 2 PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION) RELEASE_VERSION = '13.0.0' @@ -223,17 +223,6 @@ package_file = 'clang' elif package_name == 'clang-tidy': package_file = 'clang-tidy' - elif package_name == 'lld_mac': - # TODO(thakis): Remove this block eventually. - if host_os not in ('mac', 'mac-arm64'): - print('The lld_mac package can only be downloaded on macOS.', - file=sys.stderr) - print('On non-mac, lld is included in the clang package.', - file=sys.stderr) - else: - print('lld is now included in the clang package even on mac.', - file=sys.stderr) - return 1 elif package_name == 'objdump': package_file = 'llvmobjdump' elif package_name == 'translation_unit':