Skip to content

Commit 824f68c

Browse files
committed
Get toolchain BUILD files generated by the script
1 parent c8733ef commit 824f68c

File tree

3 files changed

+20
-17
lines changed

3 files changed

+20
-17
lines changed

repo_gen/generate_repo.py

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,11 @@ def create_latest(row, dir):
168168
return settings
169169

170170
def create_latest_with_configurations(row, dir):
171-
name = row["name"]
172-
default_config = row["default-configuration"]
173-
174171
if "configurations" not in row:
175172
return ""
173+
174+
name = row["name"]
175+
default_config = row["default-configuration"]
176176

177177
settings = ""
178178
for config_item in row["configurations"]:
@@ -221,7 +221,8 @@ def create_version_with_configurations(row, dir):
221221

222222
if "configurations" not in row:
223223
settings = ""
224-
for version, _ in row["versions"].items():
224+
for version_item in row["versions"]:
225+
version = version_item["version"]
225226
settings += config_setting_tpl.format(
226227
name=f"{name}-{version}",
227228
value=f"{name}-{version}",
@@ -387,6 +388,9 @@ def create_platform_aliases(name, version_item, actions):
387388

388389
# This is too specific. Needs to be generalized a little bit
389390
def create_link_args(row):
391+
if "configurations" not in row:
392+
return ""
393+
390394
args = ""
391395
name = row["name"]
392396
link_args = ""
@@ -453,13 +457,13 @@ def generate_build_files(dir, actions):
453457
if __name__ == "__main__":
454458
generate_module()
455459
generate_build_files('runtimes', ["include", "lib"])
456-
# generate_build_files('toolchain', [
457-
# "ar_actions",
458-
# "assembly_actions",
459-
# "c_compile",
460-
# "cpp_compile_actions",
461-
# "link_actions",
462-
# "link_data",
463-
# "objcopy_embed_data",
464-
# "strip",
465-
# ])
460+
generate_build_files('toolchain', [
461+
"ar_actions",
462+
"assembly_actions",
463+
"c_compile",
464+
"cpp_compile_actions",
465+
"link_actions",
466+
"link_data",
467+
"objcopy_embed_data",
468+
"strip",
469+
])

repo_gen/toolchain/BUILD.tpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
load("@bazel_skylib//lib:selects.bzl", "selects")
22

33
package(default_visibility = ["//toolchain:__subpackages__"])
4-
{version_aliases}
5-
{config_setting_group}
6-
{version_configs}
4+

toolchain/llvm/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ config_setting(
8080
"//:use_toolchain": "llvm",
8181
},
8282
)
83+
8384
config_setting(
8485
name = "llvm-19.1.7",
8586
flag_values = {

0 commit comments

Comments
 (0)