diff options
| author | Per Larsen <perlarsen@google.com> | 2024-04-05 22:44:07 +0000 |
|---|---|---|
| committer | Per Larsen <perlarsen@google.com> | 2024-04-06 02:28:27 +0000 |
| commit | b359a1416e0936476a7f2069b3b62f9898017947 (patch) | |
| tree | ad34adc71d5d004fa5429d91527ab336c659986f | |
| parent | 23cd1c9c0702eee6b6ac6326ce3da3f6c92e6d61 (diff) | |
| download | serde-b359a1416e0936476a7f2069b3b62f9898017947.tar.gz | |
rust_support will need to depend on the log crate which in turn
depends on the serde crate, so we don't want serde to implicitly
depend on rust_support as it would create a circular dependency.
Test: build.py generic-x86_64-test
Bug: None
Change-Id: Ia19b04ca7379a941f3418c09b4b0f92e94f751cc
| -rw-r--r-- | patches/rules.mk.diff | 17 | ||||
| -rw-r--r-- | rules.mk | 11 |
2 files changed, 23 insertions, 5 deletions
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff index 019e2d9..71d3386 100644 --- a/patches/rules.mk.diff +++ b/patches/rules.mk.diff @@ -1,8 +1,8 @@ diff --git a/rules.mk b/rules.mk -index 442c6fc..6c64bf9 100644 +index 442c6fc..986ff0d 100644 --- a/rules.mk +++ b/rules.mk -@@ -13,9 +13,16 @@ MODULE_RUSTFLAGS += \ +@@ -13,9 +13,25 @@ MODULE_RUSTFLAGS += \ --cfg 'feature="default"' \ --cfg 'feature="derive"' \ --cfg 'feature="serde_derive"' \ @@ -11,11 +11,20 @@ index 442c6fc..6c64bf9 100644 + +MODULE_RUSTFLAGS += \ --cfg 'feature="std"' \ - + ++else ++ ++# avoid cyclic dependence by adding dependencies manually ++MODULE_ADD_IMPLICIT_DEPS := false ++ ++MODULE_DEPS := \ ++ trusty/user/base/lib/libcore-rust/ \ ++ trusty/user/base/lib/libcompiler_builtins-rust/ \ ++ +endif + MODULE_LIBRARY_DEPS := \ + trusty/user/base/lib/liballoc-rust \ external/rust/crates/serde_derive \ - + include make/library.mk @@ -1,4 +1,4 @@ -# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features . +# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json. # Do not modify this file as changes will be overridden on upgrade. LOCAL_DIR := $(GET_LOCAL_DIR) @@ -19,6 +19,15 @@ ifeq ($(call TOBOOL,$(TRUSTY_USERSPACE)),true) MODULE_RUSTFLAGS += \ --cfg 'feature="std"' \ +else + +# avoid cyclic dependence by adding dependencies manually +MODULE_ADD_IMPLICIT_DEPS := false + +MODULE_DEPS := \ + trusty/user/base/lib/libcore-rust/ \ + trusty/user/base/lib/libcompiler_builtins-rust/ \ + endif MODULE_LIBRARY_DEPS := \ |