Browse Source

build: 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: https://github.com/nodejs/node/pull/12484
Fixes: https://github.com/nodejs/node/issues/12448
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
v6
Daniel Bevenius 8 years ago
committed by Refael Ackermann
parent
commit
9fd22bc4d4
  1. 4
      tools/gyp/pylib/gyp/generator/ninja.py
  2. 3
      tools/gyp/pylib/gyp/msvs_emulation.py

4
tools/gyp/pylib/gyp/generator/ninja.py

@ -2148,13 +2148,13 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
restat=True, restat=True,
command=mtime_preserving_solink_base % {'suffix': '@$link_file_list'}, command=mtime_preserving_solink_base % {'suffix': '@$link_file_list'},
rspfile='$link_file_list', rspfile='$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',
pool='link_pool') pool='link_pool')
master_ninja.rule( master_ninja.rule(
'link', 'link',
description='LINK $out', description='LINK $out',
command=('$ld $ldflags -o $out ' command=('$ld $ldflags -o $out '
'-Wl,--start-group $in -Wl,--end-group $solibs $libs'), '-Wl,--start-group $in $solibs $libs -Wl,--end-group'),
pool='link_pool') pool='link_pool')
elif flavor == 'win': elif flavor == 'win':
master_ninja.rule( master_ninja.rule(

3
tools/gyp/pylib/gyp/msvs_emulation.py

@ -269,7 +269,8 @@ class MsvsSettings(object):
def AdjustLibraries(self, libraries): def AdjustLibraries(self, libraries):
"""Strip -l from library if it's specified with that.""" """Strip -l from library if it's specified with that."""
libs = [lib[2:] if lib.startswith('-l') else lib for lib in libraries] libs = [lib[2:] if lib.startswith('-l') else lib for lib in libraries]
return [lib + '.lib' if not lib.endswith('.lib') else lib for lib in libs] return [lib + '.lib' if not lib.endswith('.lib') \
and not lib.endswith('.obj') else lib for lib in libs]
def _GetAndMunge(self, field, path, default, prefix, append, map): def _GetAndMunge(self, field, path, default, prefix, append, map):
"""Retrieve a value from |field| at |path| or return |default|. If """Retrieve a value from |field| at |path| or return |default|. If

Loading…
Cancel
Save