adjust things to new subdir names

conda · Sep 13, 2023 · dda3919 · dda3919
1 parent 4cb00b2
commit dda3919
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/conda_build/environ.py b/conda_build/environ.py
@@ -580,7 +580,7 @@ def get_shlib_ext(host_platform):
         return ".dll"
     elif host_platform in ["osx", "darwin"]:
         return ".dylib"
-    elif host_platform.startswith("linux") or host_platform.startswith("emscripten"):
+    elif host_platform.startswith("linux") or host_platform.endswith("-wasm32"):
         return ".so"
     elif host_platform == "noarch":
         # noarch packages should not contain shared libraries, use the system

diff --git a/conda_build/metadata.py b/conda_build/metadata.py
@@ -124,9 +124,9 @@ def get_selectors(config: Config) -> dict[str, bool]:
         linux=plat.startswith("linux-"),
         linux32=bool(plat == "linux-32"),
         linux64=bool(plat == "linux-64"),
-        emscripten=plat.startswith('emscripten-'),
-        emscripten32=bool(plat == 'emscripten-32'),
-        unix=plat.startswith(('linux-', 'osx-', 'emscripten-')),
+        emscripten=plat.startswith("emscripten-"),
+        wasi=plat.startswith("wasi-"),
+        unix=plat.startswith(("linux-", "osx-", "emscripten-")),
         arm=plat.startswith("linux-arm"),
         osx=plat.startswith("osx-"),
         unix=plat.startswith(("linux-", "osx-")),
@@ -135,6 +135,7 @@ def get_selectors(config: Config) -> dict[str, bool]:
         win64=bool(plat == "win-64"),
         x86=plat.endswith(("-32", "-64")),
         x86_64=plat.endswith("-64"),
+        wasm32=bool(plat.endswith("-wasm32")),
         os=os,
         environ=os.environ,
         nomkl=bool(int(os.environ.get("FEATURE_NOMKL", False))),

diff --git a/conda_build/utils.py b/conda_build/utils.py
@@ -113,7 +113,8 @@ def glob(pathname, recursive=True):
 mmap_PROT_WRITE = 0 if on_win else mmap.PROT_WRITE
 
 DEFAULT_SUBDIRS = {
-    "emscripten-32",
+    "emscripten-wasm32",
+    "wasi-wasm32",
     "linux-64",
     "linux-32",
     "linux-s390x",