From e90704cd9ed351e6e1709e696f9daae783685fe7 Mon Sep 17 00:00:00 2001 From: Cheng Date: Wed, 23 Oct 2024 12:48:59 +0900 Subject: [PATCH] build: fix GN build for cares/uv deps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/55477 Reviewed-By: Juan José Arboleda Reviewed-By: Luigi Pinca Reviewed-By: Rafael Gonzaga Reviewed-By: Michael Dawson --- deps/cares/unofficial.gni | 8 ++++---- deps/uv/unofficial.gni | 1 + unofficial.gni | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/deps/cares/unofficial.gni b/deps/cares/unofficial.gni index 9296548239f..e02d7f42519 100644 --- a/deps/cares/unofficial.gni +++ b/deps/cares/unofficial.gni @@ -38,7 +38,10 @@ template("cares_gn_build") { ] } - include_dirs = [ "src/lib" ] + include_dirs = [ + "src/lib", + "src/lib/include", + ] if (is_win) { include_dirs += [ "config/win32" ] } else if (is_linux) { @@ -55,9 +58,6 @@ template("cares_gn_build") { } sources = gypi_values.cares_sources_common - if (is_win) { - sources += gypi_values.cares_sources_win - } if (is_linux) { sources += [ "config/linux/ares_config.h" ] } diff --git a/deps/uv/unofficial.gni b/deps/uv/unofficial.gni index ce30341044e..7a73f891e3f 100644 --- a/deps/uv/unofficial.gni +++ b/deps/uv/unofficial.gni @@ -40,6 +40,7 @@ template("uv_gn_build") { "-Wno-extra-semi", "-Wno-implicit-fallthrough", "-Wno-missing-braces", + "-Wno-sign-compare", "-Wno-string-conversion", "-Wno-shadow", "-Wno-unreachable-code", diff --git a/unofficial.gni b/unofficial.gni index 3ff9815357d..4a2eeed1876 100644 --- a/unofficial.gni +++ b/unofficial.gni @@ -68,6 +68,7 @@ template("node_gn_build") { "-Wno-extra-semi", "-Wno-implicit-fallthrough", "-Wno-macro-redefined", + "-Wno-missing-braces", "-Wno-return-type", "-Wno-shadow", "-Wno-sometimes-uninitialized",