Skip to content

Commit

Permalink
onetbb/2020.x: fix linker error
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Jul 20, 2023
1 parent 935881f commit 2d133b4
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions recipes/onetbb/2020.x/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import glob
import os
import textwrap

Expand Down Expand Up @@ -205,6 +206,9 @@ def _patch_sources(self):
replace_in_file(self, linux_include, "= gcc", "= $(CC)")
if self.version != "2019_u9" and self.settings.build_type == "Debug":
replace_in_file(self, os.path.join(self.source_folder, "Makefile"), "release", "debug")
for inc_file in glob.glob(os.path.join(self.source_folder, "build", "*.inc")):
# Fix 'ar: two different operation options specified' due to unrecognized -m64 flag in 2020.04
replace_in_file(self, inc_file, "LIB_LINK_FLAGS += -m64", "LIB_LINK_FLAGS += ", strict=False)

def build(self):
self._patch_sources()
Expand Down Expand Up @@ -297,6 +301,7 @@ def package(self):

def package_info(self):
self.cpp_info.set_property("cmake_file_name", "TBB")
self.cpp_info.set_property("cmake_target_name", "TBB::TBB")

suffix = "_debug" if self.settings.build_type == "Debug" else ""

Expand Down

0 comments on commit 2d133b4

Please sign in to comment.