diff options
| author | Andrei Homescu <ahomescu@google.com> | 2023-09-08 05:19:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-09-08 05:19:20 +0000 |
| commit | 3ab4ebd693c90563b03956f86f16cf79cb84ea20 (patch) | |
| tree | a7d4dcc3176c7836e82a672f3d0799cf8eb184aa | |
| parent | 4aec2ba198c0a206b3499119c3fe861e8f98d47c (diff) | |
| download | sample-3ab4ebd693c90563b03956f86f16cf79cb84ea20.tar.gz | |
Revert "rust: Use autogenerated Trusty makefile rules"
This reverts commit 4aec2ba198c0a206b3499119c3fe861e8f98d47c.
Reason for revert: broke downstream
Change-Id: I435e43514e70c4edb751bcfb9ac44dff4235ee54
| -rw-r--r-- | hwwsk/rules.mk | 2 | ||||
| -rw-r--r-- | memref-test/rust/rules.mk | 2 | ||||
| -rw-r--r-- | rust-hello-world/app/rules.mk | 4 | ||||
| -rw-r--r-- | rust-hello-world/rules.mk | 4 | ||||
| -rw-r--r-- | rust_no_std/rules.mk | 2 | ||||
| -rw-r--r-- | skel_rust/rules.mk | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/hwwsk/rules.mk b/hwwsk/rules.mk index b1c3b1a..b833bdb 100644 --- a/hwwsk/rules.mk +++ b/hwwsk/rules.mk @@ -27,7 +27,7 @@ MODULE_CRATE_NAME := hwwsk MODULE_LIBRARY_DEPS += \ trusty/user/base/interface/hwwsk \ trusty/user/base/lib/hwwsk/rust \ - $(call FIND_CRATE,log) \ + trusty/user/base/lib/log-rust \ trusty/user/base/lib/trusty-log \ trusty/user/base/lib/tipc/rust \ trusty/user/base/lib/trusty-std \ diff --git a/memref-test/rust/rules.mk b/memref-test/rust/rules.mk index 91f7c31..0c0281a 100644 --- a/memref-test/rust/rules.mk +++ b/memref-test/rust/rules.mk @@ -24,7 +24,7 @@ MODULE_CRATE_NAME := memref MODULE_LIBRARY_DEPS += \ trusty/user/base/lib/trusty-sys \ trusty/user/base/lib/tipc/rust \ - $(call FIND_CRATE,log) \ + trusty/user/base/lib/log-rust \ trusty/user/base/lib/trusty-std \ MODULE_BINDGEN_SRC_HEADER := $(LOCAL_DIR)/bindings.h diff --git a/rust-hello-world/app/rules.mk b/rust-hello-world/app/rules.mk index 566377f..0c5ab51 100644 --- a/rust-hello-world/app/rules.mk +++ b/rust-hello-world/app/rules.mk @@ -25,8 +25,8 @@ MODULE_SRCS += \ MODULE_CRATE_NAME := hello_world_in_rust_app MODULE_LIBRARY_DEPS += \ - $(call FIND_CRATE,libc) \ - $(call FIND_CRATE,log) \ + trusty/user/base/lib/libc-rust \ + trusty/user/base/lib/log-rust \ trusty/user/base/lib/tipc/rust \ trusty/user/base/lib/trusty-log \ trusty/user/app/sample/rust-hello-world \ diff --git a/rust-hello-world/rules.mk b/rust-hello-world/rules.mk index a012757..d20af16 100644 --- a/rust-hello-world/rules.mk +++ b/rust-hello-world/rules.mk @@ -25,8 +25,8 @@ MODULE_SRCS += \ MODULE_CRATE_NAME := hello_world_in_rust MODULE_LIBRARY_DEPS += \ - $(call FIND_CRATE,libc) \ - $(call FIND_CRATE,log) \ + trusty/user/base/lib/libc-rust \ + trusty/user/base/lib/log-rust \ trusty/user/base/lib/tipc/rust \ trusty/user/base/lib/trusty-log \ diff --git a/rust_no_std/rules.mk b/rust_no_std/rules.mk index 5e6ab48..c5ed362 100644 --- a/rust_no_std/rules.mk +++ b/rust_no_std/rules.mk @@ -27,7 +27,7 @@ MODULE_CRATE_NAME := no_std MODULE_LIBRARY_DEPS += \ trusty/user/base/lib/dlmalloc \ trusty/user/base/lib/trusty-std \ - $(call FIND_CRATE,libc) \ + trusty/user/base/lib/libc-rust \ MODULE_ADD_IMPLICIT_DEPS := false diff --git a/skel_rust/rules.mk b/skel_rust/rules.mk index 112759c..0bb5d00 100644 --- a/skel_rust/rules.mk +++ b/skel_rust/rules.mk @@ -25,8 +25,8 @@ MODULE_SRCS += \ MODULE_CRATE_NAME := skel MODULE_LIBRARY_DEPS += \ - $(call FIND_CRATE,libc) \ - $(call FIND_CRATE,log) \ + trusty/user/base/lib/libc-rust \ + trusty/user/base/lib/log-rust \ trusty/user/base/lib/system_state/rust \ trusty/user/base/lib/tipc/rust \ trusty/user/base/lib/trusty-log \ |