Skip to content

Commit cc64f0b

Browse files
r-barnesmeta-codesync[bot]
authored andcommitted
Remove boost 169 from builder.py
Summary: Existing code unquestioningly adds VC flags to output and also Boost 1.69 stuff, but this version of Boost (probably) isn't used any more. Remove it. Reviewed By: zzl0 Differential Revision: D90271489 fbshipit-source-id: cec11ebaac6c34e24e495b56adbdc88cbdf797e1
1 parent 0ac03e4 commit cc64f0b

File tree

1 file changed

+7
-24
lines changed

1 file changed

+7
-24
lines changed

build/fbcode_builder/getdeps/builder.py

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -703,12 +703,13 @@ def __init__(
703703
self.defines.update(extra_cmake_defines)
704704
self.cmake_target = cmake_target
705705

706-
try:
707-
from .facebook.vcvarsall import extra_vc_cmake_defines
708-
except ImportError:
709-
pass
710-
else:
711-
self.defines.update(extra_vc_cmake_defines)
706+
if build_opts.is_windows():
707+
try:
708+
from .facebook.vcvarsall import extra_vc_cmake_defines
709+
except ImportError:
710+
pass
711+
else:
712+
self.defines.update(extra_vc_cmake_defines)
712713

713714
self.loader = loader
714715
if build_opts.shared_libs:
@@ -824,24 +825,6 @@ def _compute_cmake_define_args(self, env):
824825
# tests.
825826
defines["CMAKE_BUILD_WITH_INSTALL_RPATH"] = "ON"
826827

827-
boost_169_is_required = False
828-
if self.loader:
829-
for m in self.loader.manifests_in_dependency_order():
830-
preinstalled = m.get_section_as_dict("preinstalled.env", self.ctx)
831-
boost_169_is_required = "BOOST_ROOT_1_69_0" in preinstalled.keys()
832-
if boost_169_is_required:
833-
break
834-
835-
if (
836-
boost_169_is_required
837-
and self.build_opts.allow_system_packages
838-
and self.build_opts.host_type.get_package_manager()
839-
and self.build_opts.host_type.get_package_manager() == "rpm"
840-
):
841-
# Boost 1.69 rpms don't install cmake config to the system, so to point to them explicitly
842-
defines["BOOST_INCLUDEDIR"] = "/usr/include/boost169"
843-
defines["BOOST_LIBRARYDIR"] = "/usr/lib64/boost169"
844-
845828
defines.update(self.defines)
846829
define_args = ["-D%s=%s" % (k, v) for (k, v) in defines.items()]
847830

0 commit comments

Comments
 (0)