Browse files

gyp: fix ninja build failure (GYP patch)

Currently the files specified in libraries in node.gyp `cctest` target are
getting a '.lib' extension on windows when generated with ninja.
This commit adds a check to see if a file has a '.obj' extension and in
that case no '.lib' extension will be added.

Also, the LIBS specified in the 'libraries' section are not
being included in the --start-group --end-group section which
means that these libraries will not be searched causing issue
with linkers where the order matters.

PR-URL: #12484
Fixes: #12448
Reviewed-By: Benjamin Gruenbaum <>
Reviewed-By: James M Snell <>
Reviewed-By: Refael Ackermann <>
Reviewed-By: Gibson Fahnestock <>
  • Loading branch information...
danbev authored and MylesBorins committed Apr 18, 2017
1 parent 12191f6 commit 3d9ad827296905b6cf54519f0b208617afd2ee85
Showing with 4 additions and 4 deletions.
  1. +2 −2 tools/gyp/pylib/gyp/generator/
  2. +2 −2 tools/gyp/pylib/gyp/
@@ -2148,13 +2148,13 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
command=mtime_preserving_solink_base % {'suffix': '@$link_file_list'},
rspfile_content='-Wl,--start-group $in -Wl,--end-group $solibs $libs',
rspfile_content='-Wl,--start-group $in $solibs $libs -Wl,--end-group',
description='LINK $out',
command=('$ld $ldflags -o $out '
'-Wl,--start-group $in -Wl,--end-group $solibs $libs'),
'-Wl,--start-group $in $solibs $libs -Wl,--end-group'),
elif flavor == 'win':
@@ -273,8 +273,8 @@ def ConvertVSMacros(self, s, base_to_build=None, config=None):
def AdjustLibraries(self, libraries):
"""Strip -l from library if it's specified with that."""
libs = [lib[2:] if lib.startswith('-l') else lib for lib in libraries]
return [lib + '.lib' if not lib.lower().endswith('.lib') else lib
for lib in libs]
return [lib + '.lib' if not lib.lower().endswith('.lib') \
and not lib.lower().endswith('.obj') else lib for lib in libs]
def _GetAndMunge(self, field, path, default, prefix, append, map):
"""Retrieve a value from |field| at |path| or return |default|. If

0 comments on commit 3d9ad82

Please sign in to comment.