aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrlando Arbildo <oarbildo@google.com>2023-11-16 21:48:28 +0000
committerOrlando Arbildo <oarbildo@google.com>2024-01-26 20:13:07 +0000
commite9a44b53e191ea7061edcb2fecdef17072aaeceb (patch)
tree8d6528971a1550277f56a52303d1ccef11699312
parent55759f886349ea1fcf6ba3218db6646a2695be00 (diff)
downloadlibc-e9a44b53e191ea7061edcb2fecdef17072aaeceb.tar.gz
updating rules.mk.diff
Updating rules.mk.diff for latest build files Bug: 281857510 Test: build.py Change-Id: Id956f0016f5809aa2af2559af3a5399fdb5bb114
-rw-r--r--patches/rules.mk.diff10
-rw-r--r--rules.mk3
2 files changed, 5 insertions, 8 deletions
diff --git a/patches/rules.mk.diff b/patches/rules.mk.diff
index c3310b80..bad06a22 100644
--- a/patches/rules.mk.diff
+++ b/patches/rules.mk.diff
@@ -2,16 +2,14 @@ diff --git a/rules.mk b/rules.mk
index 92f34db68..08cf2d6c3 100644
--- a/rules.mk
+++ b/rules.mk
-@@ -24,8 +24,12 @@ MODULE_RUSTFLAGS += \
+@@ -24,5 +24,11 @@
--cfg 'libc_ptr_addr_of' \
--cfg 'libc_underscore_const_names' \
--cfg 'libc_union' \
+ -A unknown-lints \
-
- MODULE_LIBRARY_DEPS := \
- external/rust/crates/rustc-std-workspace-core \
++
++MODULE_LIBRARY_DEPS := \
+ trusty/user/base/lib/libcompiler_builtins-rust \
+ trusty/user/base/lib/libcore-rust \
+ trusty/user/base/lib/libc-trusty \
-
- include make/library.mk
+
diff --git a/rules.mk b/rules.mk
index 008e09d2..f4d15420 100644
--- a/rules.mk
+++ b/rules.mk
@@ -1,4 +1,4 @@
-# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json.
+# This file is generated by cargo2rulesmk.py --run --config cargo2rulesmk.json --features ..
# Do not modify this file as changes will be overridden on upgrade.
LOCAL_DIR := $(GET_LOCAL_DIR)
@@ -27,7 +27,6 @@ MODULE_RUSTFLAGS += \
-A unknown-lints \
MODULE_LIBRARY_DEPS := \
- external/rust/crates/rustc-std-workspace-core \
trusty/user/base/lib/libcompiler_builtins-rust \
trusty/user/base/lib/libcore-rust \
trusty/user/base/lib/libc-trusty \