Skip to content

Commit

Permalink
onetbb: fix LDFLAGS getting incorrectly applied to ar command
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed Aug 16, 2023
1 parent 17fea74 commit 9fc3462
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,9 +190,6 @@ 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 @@ -204,6 +201,9 @@ def generate(self):
vcvars.generate()

def _patch_sources(self):
# Fix LDFLAGS getting incorrectly applied to ar command
linux_include = os.path.join(self.source_folder, "build", "common_rules.inc")
replace_in_file(self, linux_include, "LIB_LINK_FLAGS += $(LDFLAGS)", "")
# Get the version of the current compiler instead of gcc
linux_include = os.path.join(self.source_folder, "build", "linux.inc")
replace_in_file(self, linux_include, "shell gcc", "shell $(CC)")
Expand Down

0 comments on commit 9fc3462

Please sign in to comment.