You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/05/13 05:23:28 UTC
[incubator-nuttx-apps] branch master updated: libuv: Don't add idna.c to CSRCS if test enabled
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 24c16780e libuv: Don't add idna.c to CSRCS if test enabled
24c16780e is described below
commit 24c16780e242428256a8136d8f7d3367160cc725
Author: Huang Qi <hu...@xiaomi.com>
AuthorDate: Fri May 13 09:51:10 2022 +0800
libuv: Don't add idna.c to CSRCS if test enabled
test-idna.c will include idna.c and then cause multiple definition.
Signed-off-by: Huang Qi <hu...@xiaomi.com>
---
system/libuv/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/system/libuv/Makefile b/system/libuv/Makefile
index 717d491c0..fe15c5479 100644
--- a/system/libuv/Makefile
+++ b/system/libuv/Makefile
@@ -69,7 +69,9 @@ CSRCS += posix-hrtime.c
CSRCS += posix-poll.c
CSRCS += uv-data-getter-setters.c
CSRCS += version.c
+ifneq ($(CONFIG_LIBUV_UTILS_TEST),)
CSRCS += idna.c
+endif
CSRCS += no-fsevents.c
CSRCS += uv-common.c
CSRCS += strscpy.c