File tree 4 files changed +9
-8
lines changed
main/starlark/builtins_bzl/common
test/java/com/google/devtools/build/lib/rules/objc
4 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -235,7 +235,7 @@ cc_import = rule(
235
235
"_grep_includes" : attr .label (
236
236
allow_files = True ,
237
237
executable = True ,
238
- cfg = "host " ,
238
+ cfg = "exec " ,
239
239
default = Label ("@" + semantics .get_repo () + "//tools/cpp:grep-includes" ),
240
240
),
241
241
"_cc_toolchain" : attr .label (default = "@" + semantics .get_repo () + "//tools/cpp:current_cc_toolchain" ),
Original file line number Diff line number Diff line change @@ -616,7 +616,7 @@ attrs = {
616
616
"_grep_includes" : attr .label (
617
617
allow_files = True ,
618
618
executable = True ,
619
- cfg = "host " ,
619
+ cfg = "exec " ,
620
620
default = Label ("@" + semantics .get_repo () + "//tools/cpp:grep-includes" ),
621
621
),
622
622
"_cc_toolchain" : attr .label (default = "@//tools/cpp:current_cc_toolchain" ),
Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ _COMPILE_DEPENDENCY_RULE = {
85
85
_INCLUDE_SCANNING_RULE = {
86
86
"_grep_includes" : attr .label (
87
87
allow_single_file = True ,
88
- cfg = "host " ,
88
+ cfg = "exec " ,
89
89
default = "@" + semantics .get_repo () + "//tools/cpp:grep-includes" ,
90
90
executable = True ,
91
91
),
@@ -103,7 +103,7 @@ _COPTS_RULE = {
103
103
104
104
_XCRUN_RULE = {
105
105
"_xcrunwrapper" : attr .label (
106
- cfg = "host " ,
106
+ cfg = "exec " ,
107
107
default = "@" + semantics .get_repo () + "//tools/objc:xcrunwrapper" ,
108
108
executable = True ,
109
109
),
Original file line number Diff line number Diff line change @@ -139,8 +139,8 @@ public void testLipoAction() throws Exception {
139
139
assertThat (Artifact .toRootRelativePaths (action .getInputs ())).containsAtLeast (i386Lib , x8664Lib );
140
140
141
141
assertContainsSublist (
142
- action .getArguments (),
143
- ImmutableList .of (MOCK_XCRUNWRAPPER_EXECUTABLE_PATH , LIPO , "-create" ));
142
+ removeConfigFragment ( action .getArguments () ),
143
+ ImmutableList .of (removeConfigFragment ( MOCK_XCRUNWRAPPER_EXECUTABLE_PATH ) , LIPO , "-create" ));
144
144
String binFragment =
145
145
removeConfigFragment (targetConfig .getBinFragment (RepositoryName .MAIN ) + "/" );
146
146
assertThat (removeConfigFragment (action .getArguments ()))
@@ -223,8 +223,9 @@ public void testWatchSimulatorLipoAction() throws Exception {
223
223
assertThat (Artifact .toRootRelativePaths (action .getInputs ()))
224
224
.containsAtLeast (i386Bin , armv7kBin );
225
225
226
- assertContainsSublist (action .getArguments (), ImmutableList .of (
227
- MOCK_XCRUNWRAPPER_EXECUTABLE_PATH , LIPO , "-create" ));
226
+ assertContainsSublist (
227
+ removeConfigFragment (action .getArguments ()),
228
+ ImmutableList .of (removeConfigFragment (MOCK_XCRUNWRAPPER_EXECUTABLE_PATH ), LIPO , "-create" ));
228
229
String binFragment =
229
230
removeConfigFragment (targetConfig .getBinFragment (RepositoryName .MAIN ) + "/" );
230
231
assertThat (removeConfigFragment (action .getArguments ()))
You can’t perform that action at this time.
0 commit comments