Skip to content

Commit

Permalink
Add win-arm64 as a recognized platform (#4579)
Browse files Browse the repository at this point in the history
* Add `win-arm64` as a recognized platform

* Add news
  • Loading branch information
chenghlee authored Sep 13, 2022
1 parent 324ab82 commit 78a729e
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 2 deletions.
2 changes: 1 addition & 1 deletion conda_build/cli/main_convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def parse_args(args):
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'],
'win-32', 'win-64', 'win-arm64', 'all'],
help="Platform to convert the packages to.",
default=None
)
Expand Down
3 changes: 2 additions & 1 deletion conda_build/convert.py
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,8 @@ def conda_convert(file_path, output_dir=".", show_imports=False, platforms=None,
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']
'win-32', 'win-64', 'win-arm64',
]

for platform in platforms:

Expand Down
1 change: 1 addition & 0 deletions conda_build/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ def glob(pathname, recursive=True):
"linux-aarch64",
"win-64",
"win-32",
"win-arm64",
"osx-64",
"osx-arm64",
"zos-z",
Expand Down
3 changes: 3 additions & 0 deletions conda_build/windows.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ def build_vcvarsall_vs_path(version):


def msvc_env_cmd(bits, config, override=None):
# TODO: this function will likely break on `win-arm64`. However, unless
# there's clear user demand, it's not clear that we should invest the
# effort into updating a known deprecated function for a new platform.
log = get_logger(__name__)
log.warn("Using legacy MSVC compiler setup. This will be removed in conda-build 4.0. "
"If this recipe does not use a compiler, this message is safe to ignore. "
Expand Down
11 changes: 11 additions & 0 deletions news/4579-add-win-arm64
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
### Enhancements

* Add `win-arm64` as a recognized platform (subdir).

### Bug fixes

### Deprecations

### Docs

### Other

0 comments on commit 78a729e

Please sign in to comment.