Skip to content

Replace hardcoded -g0 with toolchain features #29048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
keith wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −6
Open

Replace hardcoded -g0 with toolchain features #29048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/main/starlark/builtins_bzl/common/builtin_exec_platforms.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
See https://github.com/bazelbuild/bazel/discussions/19213.
"""

# TODO: Remove when get_current_os_name is no longer needed
load("@_builtins//:common/python/py_internal.bzl", "py_internal")

# The fragments that make up Bazel's exec transition. The fragment() calls in
# this file fill out this map.
bazel_fragments = {}
Expand Down Expand Up @@ -316,9 +313,8 @@ bazel_fragments["CppOptions"] = fragment(
func = lambda settings: {
"//command_line_option:compiler": settings["//command_line_option:host_compiler"],
"//command_line_option:grte_top": settings["//command_line_option:host_grte_top"],
# TODO: Properly fix https://github.com/bazelbuild/bazel/issues/24545 with features.
"//command_line_option:copt": settings["//command_line_option:host_copt"] + ([] if py_internal.get_current_os_name() == "windows" else ["-g0"]),
"//command_line_option:cxxopt": settings["//command_line_option:host_cxxopt"] + ([] if py_internal.get_current_os_name() == "windows" else ["-g0"]),
"//command_line_option:copt": settings["//command_line_option:host_copt"],
"//command_line_option:cxxopt": settings["//command_line_option:host_cxxopt"],
"//command_line_option:conlyopt": settings["//command_line_option:host_conlyopt"],
"//command_line_option:per_file_copt": settings["//command_line_option:host_per_file_copt"],
"//command_line_option:linkopt": settings["//command_line_option:host_linkopt"],
Expand Down
Loading