Skip to content

Commit

Permalink
Work around linter limitations
Browse files Browse the repository at this point in the history
  • Loading branch information
System-Arch committed Nov 6, 2022
1 parent 1ae68df commit aed24c8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions recipes/openssl/1.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ def generate(self):
# 1.1.0 era Makefiles don't do well with parallel installs
if self._full_version >= "1.1.0" and self._full_version < "1.1.1":
tc.make_args = ["-j1"]
if self.settings_build.get_safe("os") == "Macos" and not cross_building(self):
if self.settings.os == "Macos" and not cross_building(self):
tc.extra_cflags = ["-isysroot {}".format(XCRun(self).sdk_path)]
tc.extra_cxxflags = ["-isysroot {}".format(XCRun(self).sdk_path)]
tc.extra_ldflags = ["-isysroot {}".format(XCRun(self).sdk_path)]
Expand Down Expand Up @@ -647,7 +647,7 @@ def _create_targets(self):
shared_target = ''
if self.settings.os == 'Neutrino':
if self.options.shared:
shared_extension = 'shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",'
shared_extension = 'shared_extension => r".so.\$(SHLIB_VERSION_NUMBER)",'
shared_target = 'shared_target => "gnu-shared",'
if self.options.get_safe("fPIC", True):
shared_cflag='shared_cflag => "-fPIC",'
Expand Down

0 comments on commit aed24c8

Please sign in to comment.