Skip to content

Commit

Permalink
imagemagick: try to fix macOS cross building
Browse files Browse the repository at this point in the history
  • Loading branch information
valgur committed May 19, 2024
1 parent 05451cc commit 570a447
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions recipes/imagemagick/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.apple import fix_apple_shared_install_name, is_apple_os, XCRun, to_apple_arch

Check warning on line 6 in recipes/imagemagick/all/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration)

Unused fix_apple_shared_install_name imported from conan.tools.apple

Check warning on line 6 in recipes/imagemagick/all/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration)

Unused is_apple_os imported from conan.tools.apple
from conan.tools.build import can_run
from conan.tools.cmake import CMakeToolchain, CMake
from conan.tools.env import VirtualRunEnv
Expand Down Expand Up @@ -315,6 +316,11 @@ def yes_no(o):
"--with-djvu={}".format(yes_no(self.options.with_djvu)),
"--with-utilities={}".format(yes_no(self.options.utilities)),
]
if self.settings.compiler == "apple-clang":
tc.extra_cflags.extend([
"-isysroot", XCRun(self).sdk_path,
"-arch", to_apple_arch(self),
])
tc.generate()

deps = AutotoolsDeps(self)
Expand Down

0 comments on commit 570a447

Please sign in to comment.