Skip to content

Commit 2ab02ec

Browse files
renemeuilianries
andauthored
Apply suggestions from code review
Co-authored-by: Uilian Ries <[email protected]>
1 parent e029672 commit 2ab02ec

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

recipes/botan/all/conanfile.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,6 @@ def source(self):
231231
def _cxxflags(self):
232232
global_cxxflags = " ".join(self.conf.get("tools.build:cxxflags", default=[], check_type=list))
233233
env_cxxflags = VirtualBuildEnv(self).vars().get("CXXFLAGS")
234-
if env_cxxflags is None:
235-
env_cxxflags = os.getenv("CXXFLAGS", "")
236234
cxxflags = f"{env_cxxflags} {global_cxxflags}".strip()
237235
return cxxflags if len(cxxflags) > 0 else None
238236

@@ -260,12 +258,7 @@ def package(self):
260258
with chdir(self, self.source_folder):
261259
# Note: this will fail to properly consider the package_folder if a "conan build" followed by a "conan export-pkg" is executed
262260
self.run(self._make_install_cmd)
263-
if is_apple_os(self):
264-
# fix rpath to make installed library relocatable (CCI KB-H077)
265-
with chdir(self, os.path.join(self.package_folder, "lib")):
266-
for dylib in glob.glob("*.dylib"):
267-
if not os.path.islink(dylib):
268-
self.run(f"install_name_tool -id @rpath/{os.path.basename(dylib)} {dylib}")
261+
fix_apple_shared_install_name(self)
269262

270263
def package_info(self):
271264
major_version = Version(self.version).major

0 commit comments

Comments
 (0)