diff options
| -rw-r--r-- | tools/cpp/CROSSTOOL.tpl | 10 | ||||
| -rw-r--r-- | tools/cpp/wrapper/bin/pydir/msvc_link.py | 4 |
2 files changed, 1 insertions, 13 deletions
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index 580c7a0ef4..a2bf86b7a1 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -513,13 +513,8 @@ toolchain { } iterate_over: 'libraries_to_link.object_files' flag_group { - expand_if_false: 'libraries_to_link.is_whole_archive' flag: '%{libraries_to_link.object_files}' } - flag_group { - expand_if_true: 'libraries_to_link.is_whole_archive' - flag: '/WHOLEARCHIVE:%{libraries_to_link.object_files}' - } } flag_group { expand_if_equal: { @@ -527,13 +522,8 @@ toolchain { value: 'object_file' } flag_group { - expand_if_false: 'libraries_to_link.is_whole_archive' flag: '%{libraries_to_link.name}' } - flag_group { - expand_if_true: 'libraries_to_link.is_whole_archive' - flag: '/WHOLEARCHIVE:%{libraries_to_link.name}' - } } flag_group { expand_if_equal: { diff --git a/tools/cpp/wrapper/bin/pydir/msvc_link.py b/tools/cpp/wrapper/bin/pydir/msvc_link.py index 91176446f8..c0011a256e 100644 --- a/tools/cpp/wrapper/bin/pydir/msvc_link.py +++ b/tools/cpp/wrapper/bin/pydir/msvc_link.py @@ -33,9 +33,6 @@ LINKPATTERNS = [ ('-L(.+)', ['/LIBPATH:$PATH0']), ('-static', []), ('-shared', ['/DLL']), - # TODO(pcloudy): Make "whole archive" a feature in CROSSTOOL - # /WHOLEARCHIVE is supported in Visual Stuido 2015 update 2 - (('-whole-archive', '(.+)'), ['/WHOLEARCHIVE:$PATH0']), ('-no-whole-archive', []), ('-rdynamic', []), (r'-Wl,(.+)\.lib', ['$0.lib']), @@ -44,6 +41,7 @@ LINKPATTERNS = [ ('-Wl,-rpath(.+)', []), ('-Wl,-S', []), # Debug symbols are in pdb files. ('-Wl,/SUBSYSTEM:(WINDOWS|CONSOLE)', ['/SUBSYSTEM:$0']), + (r'/WHOLEARCHIVE:(.+)\.lib', ['$0.lib']), ] |