Skip to content

Commit 30bb158

Browse files
authored
Simplify Win LLVM path under src/third_party (#1366)
As a preparation to support Windows ARM64 build hosts (#1296), with this commit Windows LLVM archives are extracted as third_party/llvm/bin/... third_party/llvm/lib/... third_party/llvm/include/... rather than third_party/llvm/clang+llvm-20.1.1-x86_64-pc-windows-msvc/bin/... third_party/llvm/clang+llvm-20.1.1-x86_64-pc-windows-msvc/lib/... third_party/llvm/clang+llvm-20.1.1-x86_64-pc-windows-msvc/include/... This simplification will allow src/bazel/bazel_wrapper/bazel.bat to use the same BAZEL_LLVM environment variable even after we start using a different LLVM archive only on Windows ARM64 hosts. This is just a code refactoring and should not change any behavior in the final artifacts. PiperOrigin-RevId: 816143880
1 parent 915f345 commit 30bb158

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/bazel/bazel_wrapper/bazel.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set TMP_MOZC_BAZEL_WRAPPER_DIR=%~dp0
44
set TMP_MOZC_SRC_DIR=%TMP_MOZC_BAZEL_WRAPPER_DIR:~0,-21%
55

66
rem set BAZEL_LLVM only if clang-cl exists under third_party/llvm.
7-
set TMP_MOZC_LLVM_DIR=%TMP_MOZC_SRC_DIR%\third_party\llvm\clang+llvm-20.1.1-x86_64-pc-windows-msvc
8-
if exist %TMP_MOZC_LLVM_DIR% set BAZEL_LLVM=%TMP_MOZC_LLVM_DIR%
7+
set TMP_MOZC_LLVM_DIR=%TMP_MOZC_SRC_DIR%\third_party\llvm
8+
if exist %TMP_MOZC_LLVM_DIR%\bin\clang-cl.exe set BAZEL_LLVM=%TMP_MOZC_LLVM_DIR%
99
set TMP_MOZC_LLVM_DIR=
1010

1111
rem set BAZEL_SH only if MSYS2 exists under third_party/msys64/bin/bash.exe.

src/build_tools/update_deps.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,11 +294,12 @@ def __call__(
294294
skipping = False
295295
elif len(paths) >= 2 and paths[1] in ['include', 'lib']:
296296
skipping = False
297+
new_path = '/'.join(paths[1:])
297298
if skipping:
298-
self.printer.print_line('skipping ' + member.name)
299+
self.printer.print_line('skipping ' + new_path)
299300
return None
300-
self.printer.print_line('extracting ' + member.name)
301-
return member
301+
self.printer.print_line('extracting ' + new_path)
302+
return member.replace(name=new_path, deep=False)
302303

303304

304305
def extract_llvm(dryrun: bool = False) -> None:

0 commit comments

Comments
 (0)