Skip to content

Commit a7135d1

Browse files
maurerojeda
authored andcommitted
rust: Use grep -Ev rather than relying on GNU grep
While GNU grep supports '\|' when in basic regular expression mode, not all grep implementations do (notably toybox grep, used to build the Android kernel, does not). Switching to grep -Ev enables extended regular expressions which includes support for the '|' operator. Signed-off-by: Matthew Maurer <mmaurer@google.com> Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com> Reviewed-by: Trevor Gross <tmgross@umich.edu> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Tested-by: Alice Ryhl <aliceryhl@google.com> Link: https://lore.kernel.org/r/20230928201421.2296518-1-mmaurer@google.com [ Reworded for typo. ] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
1 parent 45f97e6 commit a7135d1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

rust/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,13 +336,13 @@ quiet_cmd_bindgen = BINDGEN $@
336336
$(bindgen_target_cflags) $(bindgen_target_extra)
337337

338338
$(obj)/bindings/bindings_generated.rs: private bindgen_target_flags = \
339-
$(shell grep -v '^#\|^$$' $(srctree)/$(src)/bindgen_parameters)
339+
$(shell grep -Ev '^#|^$$' $(srctree)/$(src)/bindgen_parameters)
340340
$(obj)/bindings/bindings_generated.rs: $(src)/bindings/bindings_helper.h \
341341
$(src)/bindgen_parameters FORCE
342342
$(call if_changed_dep,bindgen)
343343

344344
$(obj)/uapi/uapi_generated.rs: private bindgen_target_flags = \
345-
$(shell grep -v '^#\|^$$' $(srctree)/$(src)/bindgen_parameters)
345+
$(shell grep -Ev '^#|^$$' $(srctree)/$(src)/bindgen_parameters)
346346
$(obj)/uapi/uapi_generated.rs: $(src)/uapi/uapi_helper.h \
347347
$(src)/bindgen_parameters FORCE
348348
$(call if_changed_dep,bindgen)

0 commit comments

Comments
 (0)