Merge pull request #4004 from isuruf/apple_silicon

Add Apple silicon support
conda · Aug 5, 2020 · dc6143f · dc6143f
2 parents 2b2898f + 28d1289
commit dc6143f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/conda_build/cli/main_convert.py b/conda_build/cli/main_convert.py
@@ -60,7 +60,8 @@ def parse_args(args):
         '-p', "--platform",
         dest='platforms',
         action="append",
-        choices=['osx-64', 'linux-32', 'linux-64', 'linux-ppc64', 'linux-ppc64le',
+        choices=['osx-64', 'osx-arm64',
+                 'linux-32', 'linux-64', 'linux-ppc64', 'linux-ppc64le',
                  'linux-s390x', 'linux-armv6l', 'linux-armv7l', 'linux-aarch64',
                  'win-32', 'win-64', 'all'],
         help="Platform to convert the packages to.",

diff --git a/conda_build/convert.py b/conda_build/convert.py
@@ -764,7 +764,8 @@ def conda_convert(file_path, output_dir=".", show_imports=False, platforms=None,
     source_platform_architecture = '{}-{}' .format(source_platform, architecture)
 
     if 'all' in platforms:
-        platforms = ['osx-64', 'linux-32', 'linux-64', 'linux-ppc64', 'linux-ppc64le',
+        platforms = ['osx-64', 'osx-arm64',
+                     'linux-32', 'linux-64', 'linux-ppc64', 'linux-ppc64le',
                      'linux-s390x', 'linux-armv6l', 'linux-armv7l', 'linux-aarch64',
                      'win-32', 'win-64']
 

diff --git a/conda_build/meta b/conda_build/meta
diff --git a/conda_build/metadata.py b/conda_build/metadata.py
@@ -125,7 +125,7 @@ def ns_cfg(config):
     d['luajit'] = bool(lua[0] == "2")
 
     for machine in non_x86_linux_machines:
-        d[machine] = bool(plat == 'linux-%s' % machine)
+        d[machine] = bool(plat.endswith('-%s' % machine))
 
     for feature, value in feature_list:
         d[feature] = value

diff --git a/conda_build/utils.py b/conda_build/utils.py
@@ -106,6 +106,7 @@ def glob(pathname, recursive=True):
     "win-64",
     "win-32",
     "osx-64",
+    "osx-arm64",
     "zos-z",
     "noarch",
 }