From e85007fdfb8129618e2465375ba607c363b8a76f Mon Sep 17 00:00:00 2001
From: Refael Ackermann <refack@gmail.com>
Date: Mon, 3 Sep 2018 21:56:02 -0400
Subject: [PATCH] build,win: WHOLEARCHIVE needs just lib name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fixes ninja build

PR-URL: https://github.com/nodejs/node/pull/22698
Reviewed-By: João Reis <reis@janeasystems.com>
---
 node.gyp  | 3 +--
 node.gypi | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/node.gyp b/node.gyp
index 64ed3df538..48207e2113 100644
--- a/node.gyp
+++ b/node.gyp
@@ -261,8 +261,7 @@
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalOptions': [
-                '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\'
-                    '<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
+                '/WHOLEARCHIVE:<(node_core_target_name)<(STATIC_LIB_SUFFIX)',
               ],
             },
           },
diff --git a/node.gypi b/node.gypi
index acd9f83213..db29084335 100644
--- a/node.gypi
+++ b/node.gypi
@@ -141,7 +141,7 @@
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalOptions': [
-                '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\zlib<(STATIC_LIB_SUFFIX)',
+                '/WHOLEARCHIVE:zlib<(STATIC_LIB_SUFFIX)',
               ],
             },
           },
@@ -179,7 +179,7 @@
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalOptions': [
-                '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\libuv<(STATIC_LIB_SUFFIX)',
+                '/WHOLEARCHIVE:libuv<(STATIC_LIB_SUFFIX)',
               ],
             },
           },
@@ -316,7 +316,7 @@
               'msvs_settings': {
                 'VCLinkerTool': {
                   'AdditionalOptions': [
-                    '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\<(openssl_product)',
+                    '/WHOLEARCHIVE:<(openssl_product)',
                   ],
                 },
               },