mirror of
https://github.com/facebook/proxygen.git
synced 2025-08-07 07:02:53 +03:00
fix windows builds
Summary: The new boost has an MSVC detection algorithm that 1) I don't understand and 2) does not even seem deterministic. Since our internal builds are pinned to vc142, force that in the manifest. Reviewed By: fanzeyi Differential Revision: D34085081 fbshipit-source-id: d8ce4d8e28aad14f6fa60f9227dafb546ce321e5
This commit is contained in:
committed by
Facebook GitHub Bot
parent
1913769c1e
commit
8bf2b676b7
@@ -486,6 +486,14 @@ if __name__ == "__main__":
|
|||||||
self.defines = defines or {}
|
self.defines = defines or {}
|
||||||
if extra_cmake_defines:
|
if extra_cmake_defines:
|
||||||
self.defines.update(extra_cmake_defines)
|
self.defines.update(extra_cmake_defines)
|
||||||
|
|
||||||
|
try:
|
||||||
|
from .facebook.vcvarsall import extra_vc_cmake_defines
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
self.defines.update(extra_vc_cmake_defines)
|
||||||
|
|
||||||
self.loader = loader
|
self.loader = loader
|
||||||
if build_opts.shared_libs:
|
if build_opts.shared_libs:
|
||||||
self.defines["BUILD_SHARED_LIBS"] = "ON"
|
self.defines["BUILD_SHARED_LIBS"] = "ON"
|
||||||
|
@@ -103,3 +103,6 @@ pch=off
|
|||||||
|
|
||||||
[b2.args.os=darwin]
|
[b2.args.os=darwin]
|
||||||
toolset=clang
|
toolset=clang
|
||||||
|
|
||||||
|
[b2.args.all(os=windows,fb=on)]
|
||||||
|
toolset=msvc-14.2
|
||||||
|
Reference in New Issue
Block a user