From f8c1db160ebc6b42baec294ba4ffed03805c95c4 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Thu, 19 May 2016 17:02:40 +0900 Subject: [PATCH] Only use the osfhandle hack on Windows --- common.gypi | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/common.gypi b/common.gypi index 1a79ec1aef3..6d555825784 100644 --- a/common.gypi +++ b/common.gypi @@ -118,12 +118,7 @@ ], }], ['_target_name=="node"', { - 'sources': [ - '<(DEPTH)/atom/node/osfhandle.cc', - '<(DEPTH)/atom/node/osfhandle.h', - ], 'include_dirs': [ - '<(DEPTH)/atom/node', '<(libchromiumcontent_src_dir)/v8', '<(libchromiumcontent_src_dir)/v8/include', ], @@ -135,7 +130,17 @@ }, }], ['OS=="win"', { + # Fix passing fd across modules, see |osfhandle.h| for more. + 'sources': [ + '<(DEPTH)/atom/node/osfhandle.cc', + '<(DEPTH)/atom/node/osfhandle.h', + ], + 'include_dirs': [ + '<(DEPTH)/atom/node', + ], + # Node is using networking API but linking with this itself. 'libraries': [ '-lwinmm.lib' ], + # Fix the linking error with icu. 'conditions': [ ['libchromiumcontent_component==0', { 'variables': {