Skip to content

Commit aed24c8

Browse files
committed
Work around linter limitations
1 parent 1ae68df commit aed24c8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

recipes/openssl/1.x.x/conanfile.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ def generate(self):
255255
# 1.1.0 era Makefiles don't do well with parallel installs
256256
if self._full_version >= "1.1.0" and self._full_version < "1.1.1":
257257
tc.make_args = ["-j1"]
258-
if self.settings_build.get_safe("os") == "Macos" and not cross_building(self):
258+
if self.settings.os == "Macos" and not cross_building(self):
259259
tc.extra_cflags = ["-isysroot {}".format(XCRun(self).sdk_path)]
260260
tc.extra_cxxflags = ["-isysroot {}".format(XCRun(self).sdk_path)]
261261
tc.extra_ldflags = ["-isysroot {}".format(XCRun(self).sdk_path)]
@@ -647,7 +647,7 @@ def _create_targets(self):
647647
shared_target = ''
648648
if self.settings.os == 'Neutrino':
649649
if self.options.shared:
650-
shared_extension = 'shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",'
650+
shared_extension = 'shared_extension => r".so.\$(SHLIB_VERSION_NUMBER)",'
651651
shared_target = 'shared_target => "gnu-shared",'
652652
if self.options.get_safe("fPIC", True):
653653
shared_cflag='shared_cflag => "-fPIC",'

0 commit comments

Comments
 (0)