diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/cpp/CROSSTOOL.tpl | 3 | ||||
| -rw-r--r-- | tools/cpp/wrapper/bin/pydir/msvc_link.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/cpp/CROSSTOOL.tpl b/tools/cpp/CROSSTOOL.tpl index 9ff0cf4b10..740b68cbee 100644 --- a/tools/cpp/CROSSTOOL.tpl +++ b/tools/cpp/CROSSTOOL.tpl @@ -297,6 +297,7 @@ toolchain { compiler_flag: "-g" compiler_flag: "/Od" compiler_flag: "-Xcompilation-mode=dbg" + linker_flag: "-Xcompilation-mode=dbg" } compilation_mode_flags { @@ -304,6 +305,7 @@ toolchain { compiler_flag: "/DNDEBUG" compiler_flag: "/Od" compiler_flag: "-Xcompilation-mode=fastbuild" + linker_flag: "-Xcompilation-mode=fastbuild" } compilation_mode_flags { @@ -311,5 +313,6 @@ toolchain { compiler_flag: "/DNDEBUG" compiler_flag: "/O2" compiler_flag: "-Xcompilation-mode=opt" + linker_flag: "-Xcompilation-mode=opt" } } diff --git a/tools/cpp/wrapper/bin/pydir/msvc_link.py b/tools/cpp/wrapper/bin/pydir/msvc_link.py index 8436f5fbef..b9aa81abb7 100644 --- a/tools/cpp/wrapper/bin/pydir/msvc_link.py +++ b/tools/cpp/wrapper/bin/pydir/msvc_link.py @@ -29,11 +29,12 @@ LINKPATTERNS = [ (('-o', '(.+)'), ['/OUT:$PATH0']), ('-B(.+)', []), ('-lpthread', []), - ('-l(.+)', ['lib$0.so']), ('-L(.+)', ['/LIBPATH:$PATH0']), ('-static', []), ('-shared', ['/DLL']), - ('-whole-archive', []), + # 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']), |