From c4ff0457b902491fb276e14d6df6413d01573260 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 2 Jul 2019 11:34:25 +0200 Subject: [PATCH] build: fix android cmake build Fix two 'multiple definition' symbol errors caused by compiling in sysinfo-memory.c when linux-core.c also provides them (and those are the correct ones.) Bug introduced in commit 3a1be725 ("linux: read free/total memory from /proc/meminfo") released in libuv v1.29.0. It slipped under the radar because there are no Android machines in our CI matrix. Fixes: https://github.com/libuv/libuv/issues/2357 PR-URL: https://github.com/libuv/libuv/pull/2362 Reviewed-By: Colin Ihrig --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2ed3722..a34e5a1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -260,8 +260,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android") src/unix/linux-syscalls.c src/unix/procfs-exepath.c src/unix/pthread-fixes.c - src/unix/sysinfo-loadavg.c - src/unix/sysinfo-memory.c) + src/unix/sysinfo-loadavg.c) endif() if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Android|Linux|OS/390")