Skip to content

Commit b174943

Browse files
tamirdojeda
authored andcommitted
rust: kbuild: use host dylib naming in rusttestlib-kernel
There seems to have been merge skew between commit b2c261f ("rust: kbuild: expand rusttest target for macros") and commit 0730422 ("rust: use host dylib naming convention to support macOS") ; the latter replaced `libmacros.so` with `$(libmacros_name)` and the former added an instance of `libmacros.so`. The former was not yet applied when the latter was sent, resulting in a stray `libmacros.so`. Replace the stray with `$(libmacros_name)` to allow `rusttest` to build on macOS. Fixes: 0730422 ("rust: use host dylib naming convention to support macOS") Signed-off-by: Tamir Duberstein <[email protected]> Link: https://lore.kernel.org/r/[email protected] [ Slightly reworded title. - Miguel ] Signed-off-by: Miguel Ojeda <[email protected]>
1 parent 2014c95 commit b174943

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

rust/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ rusttestlib-kernel: private rustc_target_flags = --extern ffi \
144144
--extern bindings --extern uapi
145145
rusttestlib-kernel: $(src)/kernel/lib.rs \
146146
rusttestlib-bindings rusttestlib-uapi rusttestlib-build_error \
147-
$(obj)/libmacros.so $(obj)/bindings.o FORCE
147+
$(obj)/$(libmacros_name) $(obj)/bindings.o FORCE
148148
+$(call if_changed,rustc_test_library)
149149

150150
rusttestlib-bindings: private rustc_target_flags = --extern ffi

0 commit comments

Comments
 (0)