Skip to content

Commit d5821ed

Browse files
hvadehracopybara-github
authored andcommitted
Automated rollback of commit f0a0d8a.
PiperOrigin-RevId: 792622748 Change-Id: Id3cda96446b70a191664f5ab32c7185a37d4fd64
1 parent 2bd3402 commit d5821ed

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkInternal.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,30 +960,36 @@ public Artifact createCompileActionTemplate(
960960
positional = false,
961961
named = true), // FeatureConfigurationForStarlark
962962
@Param(name = "use_pic", positional = false, named = true),
963+
@Param(name = "label", positional = false, named = true),
963964
@Param(name = "common_compile_build_variables", positional = false, named = true),
964965
@Param(name = "specific_compile_build_variables", positional = false, named = true),
965966
@Param(name = "cpp_semantics", positional = false, named = true),
967+
@Param(name = "output_name_base", positional = false, named = true),
966968
@Param(name = "cpp_compile_action_builder", positional = false, named = true)
967969
})
968970
public Artifact createParseHeaderAction(
969971
StarlarkRuleContext starlarkRuleContext,
970972
BuildConfigurationValue configuration,
971973
FeatureConfigurationForStarlark featureConfigurationForStarlark,
972974
boolean generatePicAction,
975+
Label label,
973976
CcToolchainVariables commonCompileBuildVariables,
974977
CcToolchainVariables specificCompileBuildVariables,
975978
CppSemantics semantics,
979+
String outputNameBase,
976980
CppCompileActionBuilder builder)
977981
throws RuleErrorException, EvalException {
978982
return CcStaticCompilationHelper.createParseHeaderAction(
979983
starlarkRuleContext.getRuleContext(),
980984
configuration,
981985
featureConfigurationForStarlark.getFeatureConfiguration(),
982986
generatePicAction,
987+
label,
983988
commonCompileBuildVariables,
984989
specificCompileBuildVariables,
985990
starlarkRuleContext.getRuleContext().getRuleErrorConsumer(),
986991
semantics,
992+
outputNameBase,
987993
builder);
988994
}
989995

src/main/java/com/google/devtools/build/lib/rules/cpp/CcStaticCompilationHelper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -530,10 +530,12 @@ static Artifact createParseHeaderAction(
530530
BuildConfigurationValue configuration,
531531
FeatureConfiguration featureConfiguration,
532532
boolean generatePicAction,
533+
Label label,
533534
CcToolchainVariables commonToolchainVariables,
534535
CcToolchainVariables specificToolchainVariables,
535536
RuleErrorConsumer ruleErrorConsumer,
536537
CppSemantics semantics,
538+
String outputNameBase,
537539
CppCompileActionBuilder builder)
538540
throws RuleErrorException, EvalException {
539541
builder

src/main/starlark/builtins_bzl/common/cc/compile/compile.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -802,9 +802,11 @@ def _create_cc_compile_actions(
802802
configuration = configuration,
803803
feature_configuration = feature_configuration,
804804
use_pic = generate_pic_action,
805+
label = label,
805806
common_compile_build_variables = common_compile_build_variables,
806807
specific_compile_build_variables = specific_compile_build_variables,
807808
cpp_semantics = cpp_semantics,
809+
output_name_base = output_name_base,
808810
cpp_compile_action_builder = cpp_compile_action_builder,
809811
)
810812
outputs.add_header_token_file(header_token_file)

0 commit comments

Comments
 (0)