Skip to content

Commit

Permalink
Merge pull request #205 from isuruf/gh4867
Browse files Browse the repository at this point in the history
Add gh4867.patch
  • Loading branch information
isuruf authored Jul 27, 2023
2 parents 6ce303c + 5ebaa60 commit cecbe09
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 1 deletion.
4 changes: 3 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ package:
source:
url: https://github.com/conda/{{ name }}/archive/refs/tags/{{ version }}.tar.gz
sha256: 1658015711ce4ae5c4a1888ee3f5c20e71f87be646c704927a19b4260c6ecfc8
patches:
- patches/gh4867.patch

build:
number: 0
number: 1
script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation -vv
entry_points:
- conda-build = conda_build.cli.main_build:main
Expand Down
48 changes: 48 additions & 0 deletions recipe/patches/gh4867.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
From 74c48facd64e9c682e9387b186ef0b08a9b52548 Mon Sep 17 00:00:00 2001
From: Finn Womack <[email protected]>
Date: Thu, 20 Apr 2023 13:58:00 -0700
Subject: [PATCH 1/8] add warning and return empty string

---
conda_build/windows.py | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/conda_build/windows.py b/conda_build/windows.py
index 84da4a0f..1639c554 100644
--- a/conda_build/windows.py
+++ b/conda_build/windows.py
@@ -110,6 +110,9 @@ def msvc_env_cmd(bits, config, override=None):
"If this recipe does not use a compiler, this message is safe to ignore. "
"Otherwise, use {{compiler('<language>')}} jinja2 in requirements/build."
)
+ if bits == "arm64":
+ log.warn("The legacy MSVC compiler setup does not support arm64 builds. ")
+ return ""
if override:
log.warn(
"msvc_compiler key in meta.yaml is deprecated. Use the new"
diff --git a/news/4867-arm64-msvc-env-cmd-no-op b/news/4867-arm64-msvc-env-cmd-no-op
new file mode 100644
index 00000000..a20af0a2
--- /dev/null
+++ b/news/4867-arm64-msvc-env-cmd-no-op
@@ -0,0 +1,19 @@
+### Enhancements
+
+* <news item>
+
+### Bug fixes
+
+* <news item>
+
+### Deprecations
+
+* <news item>
+
+### Docs
+
+* <news item>
+
+### Other
+
+* Added a check to print an additional warning and return an empty string when bits is "arm64" in msvc_env_cmd

0 comments on commit cecbe09

Please sign in to comment.