Skip to content

Commit

Permalink
onetbb: fix duplicate arch flag issue
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Aug 12, 2023
1 parent aec8e1c commit 922a0e6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions recipes/onetbb/2020.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ def generate(self):
tc.extra_cflags.append("-mrtm")
tc.extra_cxxflags.append("-mrtm")

# Fixes 'ar: two different operation options specified' due to duplicate -m64 flags
tc.arch_flag = ""

tc.generate()

if self.settings.compiler == "intel-cc":
Expand All @@ -207,9 +210,6 @@ 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

0 comments on commit 922a0e6

Please sign in to comment.