diff options
Diffstat (limited to 'patches/rules.mk.diff')
| -rw-r--r-- | patches/rules.mk.diff | 17 |
1 files changed, 13 insertions, 4 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 |