diff options
author | 2016-09-26 12:23:55 +0000 | |
---|---|---|
committer | 2016-09-26 17:48:15 +0000 | |
commit | af552c732fd2ca55cee169383a1d131433fb52a6 (patch) | |
tree | 1c60dc0f07a3b4d1100564fc48488f255c6bb2c5 /tools/cpp/wrapper | |
parent | 84fa11d2a71ededdc2521ab9acae91ea134a9bbd (diff) |
Some changes in MSVC toolchain
These changes could help use build TensorFlow on Windows
--
Change-Id: I98962add450da234d5965b091607817e991af383
Reviewed-on: https://bazel-review.googlesource.com/#/c/6270
MOS_MIGRATED_REVID=134266671
Diffstat (limited to 'tools/cpp/wrapper')
-rw-r--r-- | tools/cpp/wrapper/bin/pydir/msvc_link.py | 5 |
1 files changed, 3 insertions, 2 deletions
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']), |