diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-06-16 10:38:32 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2023-01-09 11:30:17 +0000 |
| commit | d1aa88c5e9f7c67908a5c675c129d1d8cb4ad1e1 (patch) | |
| tree | ec1784b23dadbcda772d57d258a5afeb39fd9e3e | |
| parent | f86faef62a91424924e735332007331c2f1fc917 (diff) | |
| download | qtwebengine-chromium-d1aa88c5e9f7c67908a5c675c129d1d8cb4ad1e1.tar.gz | |
FIXUP: Fix gn build windows issue
Omit /link flag if linking with lld-link.
Change-Id: I924e954225f713ba11844478f8a5b55401e13117
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 2c4b80c2a640797a4ffd1c2265c0209f2d8d10e1)
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/448108
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | gn/build/build_win.ninja.template | 2 | ||||
| -rwxr-xr-x | gn/build/gen.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gn/build/build_win.ninja.template b/gn/build/build_win.ninja.template index 3d2b572cd92..8969280b763 100644 --- a/gn/build/build_win.ninja.template +++ b/gn/build/build_win.ninja.template @@ -8,5 +8,5 @@ rule alink_thin description = LIB $out rule link - command = ninja -t msvc -- $ld /nologo $ldflags /PDB:$out.pdb $in $solibs $libs /link /OUT:${out} + command = ninja -t msvc -- $ld /nologo /PDB:$out.pdb $in $solibs $libs $ldflags /OUT:${out} description = LINK $out diff --git a/gn/build/gen.py b/gn/build/gen.py index b44bbb6337f..d64d030fbde 100755 --- a/gn/build/gen.py +++ b/gn/build/gen.py @@ -570,6 +570,9 @@ def WriteGNNinja(path, platform, host, options, args_list): else: ldflags.extend(['/MACHINE:x86']) + if not options.ld.endswith('lld-link.exe'): + ldflags.extend(['/link']) + static_libraries = { 'base': {'sources': [ 'src/base/command_line.cc', |