-
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #205 from isuruf/gh4867
Add gh4867.patch
- Loading branch information
Showing
2 changed files
with
51 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |