1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
Index: master/rust_uno/Library_rust_uno-example.mk
===================================================================
--- master.orig/rust_uno/Library_rust_uno-example.mk
+++ master/rust_uno/Library_rust_uno-example.mk
@@ -42,7 +42,7 @@ else
-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN \
))
$(eval $(call gb_Library_add_libs,rust_uno-example,\
- -L$(SRCDIR)/rust_uno/target/release -lrust_uno \
+ -L$(SRCDIR)/rust_uno/target/$(DEB_HOST_RUST_TYPE)/$(CARGO_CHANNEL) -lrust_uno \
))
endif
Index: master/rust_uno/Extension_rust_uno-example.mk
===================================================================
--- master.orig/rust_uno/Extension_rust_uno-example.mk
+++ master/rust_uno/Extension_rust_uno-example.mk
@@ -14,13 +14,13 @@ $(eval $(call gb_Extension_add_file,rust
$(eval $(call gb_Extension_add_files,rust_uno-example,, \
$(SRCDIR)/rust_uno/example/Addons.xcu \
$(SRCDIR)/rust_uno/example/ProtocolHandler.xcu \
- $(SRCDIR)/rust_uno/target/release/$(if $(filter WNT,$(OS_FOR_BUILD)),rust_uno.dll,librust_uno.so) \
+ $(SRCDIR)/rust_uno/target/$(DEB_HOST_RUST_TYPE)/$(CARGO_CHANNEL)/$(if $(filter WNT,$(OS_FOR_BUILD)),rust_uno.dll,librust_uno.so) \
))
$(eval $(call gb_Extension_add_libraries,rust_uno-example, \
rust_uno-example \
))
-$(SRCDIR)/rust_uno/target/release/$(if $(filter WNT,$(OS_FOR_BUILD)),rust_uno.dll,librust_uno.so): $(call gb_CustomTarget_get_target,rust_uno/cargo)
+$(SRCDIR)/rust_uno/target/$(DEB_HOST_RUST_TYPE)/$(CARGO_CHANNEL)/$(if $(filter WNT,$(OS_FOR_BUILD)),rust_uno.dll,librust_uno.so): $(call gb_CustomTarget_get_target,rust_uno/cargo)
# vim: set noet sw=4 ts=4:
|
