|
16 | 16 | cxx = "g++" |
17 | 17 | --- a/tools/clang/scripts/build.py |
18 | 18 | +++ b/tools/clang/scripts/build.py |
19 | | -@@ -517,6 +517,21 @@ def DownloadPinnedClang(): |
| 19 | +@@ -518,6 +518,21 @@ def DownloadPinnedClang(): |
20 | 20 | PINNED_CLANG_VERSION) |
21 | 21 |
|
22 | 22 |
|
|
78 | 78 | GitRevert, LLVM_DIR, IsGitAncestorToHead, |
79 | 79 | LLVM_BUILD_TOOLS_DIR, RunCommand) |
80 | 80 | from update import (CHROMIUM_DIR, DownloadAndUnpack, EnsureDirExists, |
81 | | -@@ -200,8 +200,8 @@ def AddOpenSSLToEnv(): |
| 81 | +@@ -197,8 +197,8 @@ def AddOpenSSLToEnv(): |
82 | 82 | ssl_url = (f'{CIPD_DOWNLOAD_URL}/{OPENSSL_CIPD_WIN_AMD_PATH}' |
83 | 83 | f'/+/version:2@{OPENSSL_CIPD_WIN_AMD_VERSION}') |
84 | 84 | else: |
|
89 | 89 |
|
90 | 90 | if os.path.exists(ssl_dir): |
91 | 91 | RmTree(ssl_dir) |
92 | | -@@ -577,7 +577,7 @@ def RustTargetTriple(): |
| 92 | +@@ -574,7 +574,7 @@ def RustTargetTriple(): |
93 | 93 | elif sys.platform == 'win32': |
94 | 94 | return 'x86_64-pc-windows-msvc' |
95 | 95 | else: |
|
98 | 98 |
|
99 | 99 |
|
100 | 100 | # Build the LLVM libraries and install them . |
101 | | -@@ -588,6 +588,9 @@ def BuildLLVMLibraries(skip_build, llvm_ |
102 | | - sys.executable, |
103 | | - os.path.join(CLANG_SCRIPTS_DIR, 'build.py'), |
104 | | - '--disable-asserts', |
105 | | -+ '--use-system-cmake', |
106 | | -+ '--host-cc=clang', |
107 | | -+ '--host-cxx=clang++', |
108 | | - '--no-tools', |
109 | | - '--no-runtimes', |
110 | | - # PIC needed for Rust build (links LLVM into shared object) |
111 | | -@@ -789,7 +792,8 @@ def main(): |
| 101 | +@@ -584,6 +584,9 @@ def BuildLLVMLibraries(skip_checkout, ll |
| 102 | + sys.executable, |
| 103 | + os.path.join(CLANG_SCRIPTS_DIR, 'build.py'), |
| 104 | + '--disable-asserts', |
| 105 | ++ '--use-system-cmake', |
| 106 | ++ '--host-cc=clang', |
| 107 | ++ '--host-cxx=clang++', |
| 108 | + '--no-tools', |
| 109 | + '--no-runtimes', |
| 110 | + # PIC needed for Rust build (links LLVM into shared object) |
| 111 | +@@ -797,7 +800,8 @@ def main(): |
112 | 112 | # Fetch sysroot we build rustc against. This ensures a minimum supported |
113 | 113 | # host (not Chromium target). Since the rustc linux package is for |
114 | 114 | # x86_64 only, that is the sole needed sysroot. |
|
131 | 131 | +rustflags = ["-Clink-arg=--sysroot=$DEBIAN_SYSROOT"] |
132 | 132 | --- a/tools/rust/config.toml.template |
133 | 133 | +++ b/tools/rust/config.toml.template |
134 | | -@@ -88,3 +88,12 @@ cc = "$LLVM_BIN/clang" |
| 134 | +@@ -89,3 +89,12 @@ cc = "$LLVM_BIN/clang" |
135 | 135 | cxx = "$LLVM_BIN/clang++" |
136 | 136 | linker = "$LLVM_BIN/clang" |
137 | 137 |
|
|
0 commit comments