From b6b7707dc35c3241291a66cdf33d8c4cedbdf072 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 13 Mar 2018 16:19:06 +0900 Subject: [PATCH] Fix Windows linking error --- common.gypi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/common.gypi b/common.gypi index 281529eb9b3c..5c6677b333ef 100644 --- a/common.gypi +++ b/common.gypi @@ -178,6 +178,22 @@ '-ldbghelp.lib', '-lshlwapi.lib', ], + 'msvs_settings': { + # Change location of some hard-coded paths. + 'VCLinkerTool': { + 'AdditionalOptions!': [ + '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\zlib<(STATIC_LIB_SUFFIX)', + '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\libuv<(STATIC_LIB_SUFFIX)', + '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\libopenssl<(openssl_product)', + '/WHOLEARCHIVE:<(PRODUCT_DIR)\\lib\\<(openssl_product)', + ], + 'AdditionalOptions': [ + '/WHOLEARCHIVE:<(PRODUCT_DIR)\\obj\\vendor\\node\\deps\\zlib\\zlib<(STATIC_LIB_SUFFIX)', + '/WHOLEARCHIVE:<(PRODUCT_DIR)\\obj\\vendor\\node\\deps\\uv\\libuv<(STATIC_LIB_SUFFIX)', + '/WHOLEARCHIVE:<(PRODUCT_DIR)\\obj\\vendor\\node\\deps\\openssl\\openssl<(STATIC_LIB_SUFFIX)', + ], + }, + }, }], ['OS=="linux" and libchromiumcontent_component==0', { # Prevent the linker from stripping symbols.