From 6241664404234e3f5f891ac2c2ff940dd509a12c Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Wed, 30 Dec 2020 11:09:38 +0200 Subject: [PATCH] build script: generalize cross-compilation with cmake --- build.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/build.py b/build.py index 5906cf61..464f3866 100755 --- a/build.py +++ b/build.py @@ -408,6 +408,12 @@ class CMakeTarget(Target): '-DCMAKE_PREFIX_PATH=' + builder.prefix_path, ] + if not builder.xcode: + architecture = builder.architecture() + if architecture != machine(): + args.append('-DCMAKE_SYSTEM_NAME=Darwin') + args.append('-DCMAKE_SYSTEM_PROCESSOR=' + 'aarch64' if architecture == 'arm64' else architecture) + os_version = builder.os_version() if os_version: args.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=' + os_version) @@ -982,16 +988,6 @@ class JpegTurboTarget(CMakeStaticDependencyTarget): 'https://downloads.sourceforge.net/project/libjpeg-turbo/2.0.6/libjpeg-turbo-2.0.6.tar.gz', 'd74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb') - def configure(self, builder: 'Builder'): - architecture = builder.architecture() - - if architecture != machine(): - opts = self.options - opts['CMAKE_SYSTEM_NAME'] = 'Darwin' - opts['CMAKE_SYSTEM_PROCESSOR'] = 'aarch64' if architecture == 'arm64' else architecture - - super().configure(builder) - def detect(self, builder: 'Builder') -> bool: return os.path.exists(builder.source_path + 'turbojpeg.h')