Skip to content

Commit

Permalink
Remove cxxopt flags when linting C sources. (#359)
Browse files Browse the repository at this point in the history
* Remove cxxopt flags when linting C sources.

* Remove leftover debug print.
  • Loading branch information
agoessling authored Aug 5, 2024
1 parent 32c6d70 commit 5d056cb
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions lint/clang_tidy.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def _gather_inputs(ctx, compilation_context, srcs):
inputs.append(ctx.files._global_config[0])
return inputs

def _toolchain_flags(ctx, action_name = ACTION_NAMES.cpp_compile):
def _toolchain_flags(ctx, user_flags, action_name = ACTION_NAMES.cpp_compile):
cc_toolchain = find_cpp_toolchain(ctx)
feature_configuration = cc_common.configure_features(
ctx = ctx,
Expand All @@ -58,7 +58,7 @@ def _toolchain_flags(ctx, action_name = ACTION_NAMES.cpp_compile):
compile_variables = cc_common.create_compile_variables(
feature_configuration = feature_configuration,
cc_toolchain = cc_toolchain,
user_compile_flags = ctx.fragments.cpp.cxxopts + ctx.fragments.cpp.copts,
user_compile_flags = user_flags,
)
flags = cc_common.get_memory_inefficient_command_line(
feature_configuration = feature_configuration,
Expand Down Expand Up @@ -200,9 +200,11 @@ def _get_args(ctx, compilation_context, srcs):
rule_flags = ctx.rule.attr.copts if hasattr(ctx.rule.attr, "copts") else []
sources_are_cxx = _is_cxx(srcs[0])
if (sources_are_cxx):
args.extend(_safe_flags(ctx, _toolchain_flags(ctx, ACTION_NAMES.cpp_compile) + rule_flags) + ["-xc++"])
user_flags = ctx.fragments.cpp.cxxopts + ctx.fragments.cpp.copts
args.extend(_safe_flags(ctx, _toolchain_flags(ctx, user_flags, ACTION_NAMES.cpp_compile) + rule_flags) + ["-xc++"])
else:
args.extend(_safe_flags(ctx, _toolchain_flags(ctx, ACTION_NAMES.c_compile) + rule_flags) + ["-xc"])
user_flags = ctx.fragments.cpp.copts
args.extend(_safe_flags(ctx, _toolchain_flags(ctx, user_flags, ACTION_NAMES.c_compile) + rule_flags) + ["-xc"])

# add defines
for define in compilation_context.defines.to_list():
Expand Down

0 comments on commit 5d056cb

Please sign in to comment.