? wasi-libc/32.diff
? wasi-libc/build-sdk-29.log
? wasi-libc/patch-Makefile
? wasi-sdk/testing
? wasi-sdk/compiler-rt/patches.no
? wasi-sdk/libcxx/build.log
? wasi-sdk/libcxx/patches.xx
Index: wasi-libc/Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-libc/Makefile,v
diff -u -r1.13 Makefile
--- wasi-libc/Makefile	6 May 2026 13:52:46 -0000	1.13
+++ wasi-libc/Makefile	11 May 2026 14:02:11 -0000
@@ -4,6 +4,9 @@
 GH_PROJECT =	wasi-libc
 GH_COMMIT =	wasi-sdk-29
 DISTNAME =	wasi-libc-0.20251114
+#GH_COMMIT =	wasi-sdk-32
+#DISTNAME =	wasi-libc-0.20260311
+#MODULES =	devel/cmake
 
 DISTFILES =	${GH_DISTFILE}
 DISTFILES.h = 	wasi-libc-llvm13-std-headers.tar.gz
@@ -20,7 +23,18 @@
 
 COMPILER =	ports-clang
 COMPILER_LANGS =c
+FLAVORS =	llvm22
+FLAVOR ?=
+
+# XXX when moving to 22: https://github.com/freebsd/freebsd-ports/commit/7c5b2039a45ad3fc5479a25f4143716135aa3279
+SUBST_VARS += TRIPLE
+.if ${FLAVOR:Mllvm22}
+MODCLANG_VERSION =	22
+TRIPLE=wasm32-wasip1
+.else
 MODCLANG_VERSION =	19
+TRIPLE=wasm32-wasi
+.endif
 USE_GMAKE =	yes
 ALL_TARGET =	finish
 BUILD_DEPENDS =	shells/bash
@@ -28,6 +42,7 @@
 MAKE_ENV +=	AR=${LOCALBASE}/bin/llvm-ar-${MODCLANG_VERSION} \
 		NM=${LOCALBASE}/bin/llvm-nm-${MODCLANG_VERSION} \
 		CHECK_SYMBOLS=yes \
+		TARGET_TRIPLE=${TRIPLE} \
 		BUILTINS_LIB=${WRKDIR}/libclang_rt.builtins-wasm32-wasi-25.0/libclang_rt.builtins-wasm32.a \
 		INSTALL_DIR=${WRKINST}${PREFIX}/share/wasi-sysroot
 
@@ -38,6 +53,6 @@
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/sysroot/include/* \
-		${PREFIX}/share/wasi-sysroot/include/wasm32-wasi
+		${PREFIX}/share/wasi-sysroot/include/${TRIPLE}
 	
 .include <bsd.port.mk>
Index: wasi-libc/patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-libc/patches/patch-Makefile,v
diff -u -r1.6 patch-Makefile
--- wasi-libc/patches/patch-Makefile	6 May 2026 13:52:46 -0000	1.6
+++ wasi-libc/patches/patch-Makefile	11 May 2026 14:02:11 -0000
@@ -5,6 +5,7 @@
 llvm ports so we include them here instead
 
 chunk 2: adapt regex for our grep
+chunk 3 & 4: syms for llvm22
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
@@ -26,7 +27,24 @@
  	mkdir -p "$(INSTALL_DIR)"
  	cp -p -r "$(SYSROOT)/lib" "$(SYSROOT)/share" "$(SYSROOT)/include" "$(INSTALL_DIR)"
  
-@@ -1007,19 +1007,20 @@ endif
+@@ -925,7 +925,7 @@ check-symbols: $(STARTUP_FILES) libc
+ 	for undef_sym in $$("$(NM)" --undefined-only "$(SYSROOT_LIB)"/libc.a "$(SYSROOT_LIB)"/libc-*.a "$(SYSROOT_LIB)"/*.o \
+ 	    |grep ' U ' |sed 's/.* U //' |LC_ALL=C sort |uniq); do \
+ 	    grep -q '\<'$$undef_sym'\>' "$(DEFINED_SYMBOLS)" || echo $$undef_sym; \
+-	done | grep -E -v "^__mul|__memory_base|__indirect_function_table|__tls_base" > "$(UNDEFINED_SYMBOLS)"
++	done | grep -E -v "^__mul|__memory_base|__indirect_function_table|__wasm_first_page_end|__tls_base" > "$(UNDEFINED_SYMBOLS)"
+ ifneq ($(WASI_SNAPSHOT), p2)
+ 	grep '^_*imported_wasi_' "$(UNDEFINED_SYMBOLS)" \
+ 	    > "$(SYSROOT_LIB)/libc.imports"
+@@ -998,6 +998,7 @@ endif
+ 	    -U__wasm_nontrapping_fptoint__ \
+ 	    $(if $(filter-out expected/wasm32-wasip1-threads,$(EXPECTED_TARGET_DIR)),-U__wasm_bulk_memory__) \
+ 	    -U__wasm_bulk_memory_opt__ \
++	    -U__wasip1__ \
+ 	    -U__GNUC__ \
+ 	    -U__GNUC_MINOR__ \
+ 	    -U__GNUC_PATCHLEVEL__ \
+@@ -1007,19 +1008,20 @@ endif
  	    -U__FLT_EVAL_METHOD__ -Wno-builtin-macro-redefined \
  	    | sed -e 's/__[[:upper:][:digit:]]*_ATOMIC_\([[:upper:][:digit:]_]*\)_LOCK_FREE/__compiler_ATOMIC_\1_LOCK_FREE/' \
  	    | sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \
Index: wasi-libc/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/wasi-libc/pkg/PLIST,v
diff -u -r1.5 PLIST
--- wasi-libc/pkg/PLIST	6 May 2026 13:52:46 -0000	1.5
+++ wasi-libc/pkg/PLIST	11 May 2026 14:02:11 -0000
@@ -1,245 +1,245 @@
 share/wasi-sysroot/
 share/wasi-sysroot/include/
-share/wasi-sysroot/include/wasm32-wasi/
-share/wasi-sysroot/include/wasm32-wasi/__errno.h
-share/wasi-sysroot/include/wasm32-wasi/__errno_values.h
-share/wasi-sysroot/include/wasm32-wasi/__fd_set.h
-share/wasi-sysroot/include/wasm32-wasi/__function___isatty.h
-share/wasi-sysroot/include/wasm32-wasi/__functions_malloc.h
-share/wasi-sysroot/include/wasm32-wasi/__functions_memcpy.h
-share/wasi-sysroot/include/wasm32-wasi/__header_dirent.h
-share/wasi-sysroot/include/wasm32-wasi/__header_fcntl.h
-share/wasi-sysroot/include/wasm32-wasi/__header_inttypes.h
-share/wasi-sysroot/include/wasm32-wasi/__header_netinet_in.h
-share/wasi-sysroot/include/wasm32-wasi/__header_poll.h
-share/wasi-sysroot/include/wasm32-wasi/__header_stdlib.h
-share/wasi-sysroot/include/wasm32-wasi/__header_string.h
-share/wasi-sysroot/include/wasm32-wasi/__header_sys_ioctl.h
-share/wasi-sysroot/include/wasm32-wasi/__header_sys_resource.h
-share/wasi-sysroot/include/wasm32-wasi/__header_sys_socket.h
-share/wasi-sysroot/include/wasm32-wasi/__header_sys_stat.h
-share/wasi-sysroot/include/wasm32-wasi/__header_time.h
-share/wasi-sysroot/include/wasm32-wasi/__header_unistd.h
-share/wasi-sysroot/include/wasm32-wasi/__macro_FD_SETSIZE.h
-share/wasi-sysroot/include/wasm32-wasi/__macro_PAGESIZE.h
-share/wasi-sysroot/include/wasm32-wasi/__mode_t.h
-share/wasi-sysroot/include/wasm32-wasi/__seek.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_dirent.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_in6_addr.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_in_addr.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_iovec.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_msghdr.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_pollfd.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_rusage.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_in6.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_storage.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_sockaddr_un.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_stat.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_timespec.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_timeval.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_tm.h
-share/wasi-sysroot/include/wasm32-wasi/__struct_tms.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_DIR.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_blkcnt_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_blksize_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_clock_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_clockid_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_dev_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_fd_set.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_gid_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_in_addr_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_in_port_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_ino_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_mode_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_nfds_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_nlink_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_off_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_sa_family_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_sigset_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_socklen_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_ssize_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_suseconds_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_time_t.h
-share/wasi-sysroot/include/wasm32-wasi/__typedef_uid_t.h
-share/wasi-sysroot/include/wasm32-wasi/__wasi_snapshot.h
-share/wasi-sysroot/include/wasm32-wasi/alloca.h
-share/wasi-sysroot/include/wasm32-wasi/ar.h
-share/wasi-sysroot/include/wasm32-wasi/arpa/
-share/wasi-sysroot/include/wasm32-wasi/arpa/ftp.h
-share/wasi-sysroot/include/wasm32-wasi/arpa/inet.h
-share/wasi-sysroot/include/wasm32-wasi/arpa/nameser.h
-share/wasi-sysroot/include/wasm32-wasi/arpa/nameser_compat.h
-share/wasi-sysroot/include/wasm32-wasi/arpa/telnet.h
-share/wasi-sysroot/include/wasm32-wasi/arpa/tftp.h
-share/wasi-sysroot/include/wasm32-wasi/assert.h
-share/wasi-sysroot/include/wasm32-wasi/bits/
-share/wasi-sysroot/include/wasm32-wasi/bits/alltypes.h
-share/wasi-sysroot/include/wasm32-wasi/bits/dirent.h
-share/wasi-sysroot/include/wasm32-wasi/bits/fcntl.h
-share/wasi-sysroot/include/wasm32-wasi/bits/fenv.h
-share/wasi-sysroot/include/wasm32-wasi/bits/float.h
-share/wasi-sysroot/include/wasm32-wasi/bits/hwcap.h
-share/wasi-sysroot/include/wasm32-wasi/bits/io.h
-share/wasi-sysroot/include/wasm32-wasi/bits/ioctl.h
-share/wasi-sysroot/include/wasm32-wasi/bits/ioctl_fix.h
-share/wasi-sysroot/include/wasm32-wasi/bits/ipcstat.h
-share/wasi-sysroot/include/wasm32-wasi/bits/limits.h
-share/wasi-sysroot/include/wasm32-wasi/bits/mman.h
-share/wasi-sysroot/include/wasm32-wasi/bits/poll.h
-share/wasi-sysroot/include/wasm32-wasi/bits/posix.h
-share/wasi-sysroot/include/wasm32-wasi/bits/reg.h
-share/wasi-sysroot/include/wasm32-wasi/bits/resource.h
-share/wasi-sysroot/include/wasm32-wasi/bits/setjmp.h
-share/wasi-sysroot/include/wasm32-wasi/bits/signal.h
-share/wasi-sysroot/include/wasm32-wasi/bits/socket.h
-share/wasi-sysroot/include/wasm32-wasi/bits/stat.h
-share/wasi-sysroot/include/wasm32-wasi/bits/stdint.h
-share/wasi-sysroot/include/wasm32-wasi/byteswap.h
-share/wasi-sysroot/include/wasm32-wasi/complex.h
-share/wasi-sysroot/include/wasm32-wasi/cpio.h
-share/wasi-sysroot/include/wasm32-wasi/crypt.h
-share/wasi-sysroot/include/wasm32-wasi/ctype.h
-share/wasi-sysroot/include/wasm32-wasi/dirent.h
-share/wasi-sysroot/include/wasm32-wasi/dlfcn.h
-share/wasi-sysroot/include/wasm32-wasi/endian.h
-share/wasi-sysroot/include/wasm32-wasi/err.h
-share/wasi-sysroot/include/wasm32-wasi/errno.h
-share/wasi-sysroot/include/wasm32-wasi/fcntl.h
-share/wasi-sysroot/include/wasm32-wasi/features.h
-share/wasi-sysroot/include/wasm32-wasi/fenv.h
-share/wasi-sysroot/include/wasm32-wasi/float.h
-share/wasi-sysroot/include/wasm32-wasi/fmtmsg.h
-share/wasi-sysroot/include/wasm32-wasi/fnmatch.h
-share/wasi-sysroot/include/wasm32-wasi/fts.h
-share/wasi-sysroot/include/wasm32-wasi/ftw.h
-share/wasi-sysroot/include/wasm32-wasi/getopt.h
-share/wasi-sysroot/include/wasm32-wasi/glob.h
-share/wasi-sysroot/include/wasm32-wasi/iconv.h
-share/wasi-sysroot/include/wasm32-wasi/ifaddrs.h
-share/wasi-sysroot/include/wasm32-wasi/inttypes.h
-share/wasi-sysroot/include/wasm32-wasi/iso646.h
-share/wasi-sysroot/include/wasm32-wasi/langinfo.h
-share/wasi-sysroot/include/wasm32-wasi/libgen.h
-share/wasi-sysroot/include/wasm32-wasi/limits.h
-share/wasi-sysroot/include/wasm32-wasi/locale.h
-share/wasi-sysroot/include/wasm32-wasi/malloc.h
-share/wasi-sysroot/include/wasm32-wasi/math.h
-share/wasi-sysroot/include/wasm32-wasi/memory.h
-share/wasi-sysroot/include/wasm32-wasi/monetary.h
-share/wasi-sysroot/include/wasm32-wasi/mqueue.h
-share/wasi-sysroot/include/wasm32-wasi/net/
-share/wasi-sysroot/include/wasm32-wasi/netinet/
-share/wasi-sysroot/include/wasm32-wasi/netinet/icmp6.h
-share/wasi-sysroot/include/wasm32-wasi/netinet/igmp.h
-share/wasi-sysroot/include/wasm32-wasi/netinet/in.h
-share/wasi-sysroot/include/wasm32-wasi/netinet/in_systm.h
-share/wasi-sysroot/include/wasm32-wasi/netinet/ip.h
-share/wasi-sysroot/include/wasm32-wasi/netinet/ip6.h
-share/wasi-sysroot/include/wasm32-wasi/netinet/ip_icmp.h
-share/wasi-sysroot/include/wasm32-wasi/netinet/tcp.h
-share/wasi-sysroot/include/wasm32-wasi/netinet/udp.h
-share/wasi-sysroot/include/wasm32-wasi/netpacket/
-share/wasi-sysroot/include/wasm32-wasi/netpacket/packet.h
-share/wasi-sysroot/include/wasm32-wasi/nl_types.h
-share/wasi-sysroot/include/wasm32-wasi/poll.h
-share/wasi-sysroot/include/wasm32-wasi/pthread.h
-share/wasi-sysroot/include/wasm32-wasi/regex.h
-share/wasi-sysroot/include/wasm32-wasi/sched.h
-share/wasi-sysroot/include/wasm32-wasi/scsi/
-share/wasi-sysroot/include/wasm32-wasi/search.h
-share/wasi-sysroot/include/wasm32-wasi/semaphore.h
-share/wasi-sysroot/include/wasm32-wasi/setjmp.h
-share/wasi-sysroot/include/wasm32-wasi/signal.h
-share/wasi-sysroot/include/wasm32-wasi/stdalign.h
-share/wasi-sysroot/include/wasm32-wasi/stdarg.h
-share/wasi-sysroot/include/wasm32-wasi/stdbool.h
-share/wasi-sysroot/include/wasm32-wasi/stdc-predef.h
-share/wasi-sysroot/include/wasm32-wasi/stddef.h
-share/wasi-sysroot/include/wasm32-wasi/stdint.h
-share/wasi-sysroot/include/wasm32-wasi/stdio.h
-share/wasi-sysroot/include/wasm32-wasi/stdio_ext.h
-share/wasi-sysroot/include/wasm32-wasi/stdlib.h
-share/wasi-sysroot/include/wasm32-wasi/stdnoreturn.h
-share/wasi-sysroot/include/wasm32-wasi/string.h
-share/wasi-sysroot/include/wasm32-wasi/strings.h
-share/wasi-sysroot/include/wasm32-wasi/stropts.h
-share/wasi-sysroot/include/wasm32-wasi/sys/
-share/wasi-sysroot/include/wasm32-wasi/sys/dir.h
-share/wasi-sysroot/include/wasm32-wasi/sys/errno.h
-share/wasi-sysroot/include/wasm32-wasi/sys/eventfd.h
-share/wasi-sysroot/include/wasm32-wasi/sys/fcntl.h
-share/wasi-sysroot/include/wasm32-wasi/sys/file.h
-share/wasi-sysroot/include/wasm32-wasi/sys/ioctl.h
-share/wasi-sysroot/include/wasm32-wasi/sys/mman.h
-share/wasi-sysroot/include/wasm32-wasi/sys/param.h
-share/wasi-sysroot/include/wasm32-wasi/sys/poll.h
-share/wasi-sysroot/include/wasm32-wasi/sys/random.h
-share/wasi-sysroot/include/wasm32-wasi/sys/reg.h
-share/wasi-sysroot/include/wasm32-wasi/sys/resource.h
-share/wasi-sysroot/include/wasm32-wasi/sys/select.h
-share/wasi-sysroot/include/wasm32-wasi/sys/signal.h
-share/wasi-sysroot/include/wasm32-wasi/sys/socket.h
-share/wasi-sysroot/include/wasm32-wasi/sys/stat.h
-share/wasi-sysroot/include/wasm32-wasi/sys/statvfs.h
-share/wasi-sysroot/include/wasm32-wasi/sys/stropts.h
-share/wasi-sysroot/include/wasm32-wasi/sys/syscall.h
-share/wasi-sysroot/include/wasm32-wasi/sys/sysinfo.h
-share/wasi-sysroot/include/wasm32-wasi/sys/time.h
-share/wasi-sysroot/include/wasm32-wasi/sys/timeb.h
-share/wasi-sysroot/include/wasm32-wasi/sys/times.h
-share/wasi-sysroot/include/wasm32-wasi/sys/timex.h
-share/wasi-sysroot/include/wasm32-wasi/sys/ttydefaults.h
-share/wasi-sysroot/include/wasm32-wasi/sys/types.h
-share/wasi-sysroot/include/wasm32-wasi/sys/uio.h
-share/wasi-sysroot/include/wasm32-wasi/sys/un.h
-share/wasi-sysroot/include/wasm32-wasi/sys/utsname.h
-share/wasi-sysroot/include/wasm32-wasi/syscall.h
-share/wasi-sysroot/include/wasm32-wasi/sysexits.h
-share/wasi-sysroot/include/wasm32-wasi/tar.h
-share/wasi-sysroot/include/wasm32-wasi/tgmath.h
-share/wasi-sysroot/include/wasm32-wasi/threads.h
-share/wasi-sysroot/include/wasm32-wasi/time.h
-share/wasi-sysroot/include/wasm32-wasi/uchar.h
-share/wasi-sysroot/include/wasm32-wasi/unistd.h
-share/wasi-sysroot/include/wasm32-wasi/utime.h
-share/wasi-sysroot/include/wasm32-wasi/values.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/
-share/wasi-sysroot/include/wasm32-wasi/wasi/api.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/libc-busywait.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/libc-environ.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/libc-find-relpath.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/libc-nocwd.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/libc.h
-share/wasi-sysroot/include/wasm32-wasi/wasi/wasip2.h
-share/wasi-sysroot/include/wasm32-wasi/wchar.h
-share/wasi-sysroot/include/wasm32-wasi/wctype.h
+share/wasi-sysroot/include/${TRIPLE}/
+share/wasi-sysroot/include/${TRIPLE}/__errno.h
+share/wasi-sysroot/include/${TRIPLE}/__errno_values.h
+share/wasi-sysroot/include/${TRIPLE}/__fd_set.h
+share/wasi-sysroot/include/${TRIPLE}/__function___isatty.h
+share/wasi-sysroot/include/${TRIPLE}/__functions_malloc.h
+share/wasi-sysroot/include/${TRIPLE}/__functions_memcpy.h
+share/wasi-sysroot/include/${TRIPLE}/__header_dirent.h
+share/wasi-sysroot/include/${TRIPLE}/__header_fcntl.h
+share/wasi-sysroot/include/${TRIPLE}/__header_inttypes.h
+share/wasi-sysroot/include/${TRIPLE}/__header_netinet_in.h
+share/wasi-sysroot/include/${TRIPLE}/__header_poll.h
+share/wasi-sysroot/include/${TRIPLE}/__header_stdlib.h
+share/wasi-sysroot/include/${TRIPLE}/__header_string.h
+share/wasi-sysroot/include/${TRIPLE}/__header_sys_ioctl.h
+share/wasi-sysroot/include/${TRIPLE}/__header_sys_resource.h
+share/wasi-sysroot/include/${TRIPLE}/__header_sys_socket.h
+share/wasi-sysroot/include/${TRIPLE}/__header_sys_stat.h
+share/wasi-sysroot/include/${TRIPLE}/__header_time.h
+share/wasi-sysroot/include/${TRIPLE}/__header_unistd.h
+share/wasi-sysroot/include/${TRIPLE}/__macro_FD_SETSIZE.h
+share/wasi-sysroot/include/${TRIPLE}/__macro_PAGESIZE.h
+share/wasi-sysroot/include/${TRIPLE}/__mode_t.h
+share/wasi-sysroot/include/${TRIPLE}/__seek.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_dirent.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_in6_addr.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_in_addr.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_iovec.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_msghdr.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_pollfd.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_rusage.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_sockaddr.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_sockaddr_in.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_sockaddr_in6.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_sockaddr_storage.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_sockaddr_un.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_stat.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_timespec.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_timeval.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_tm.h
+share/wasi-sysroot/include/${TRIPLE}/__struct_tms.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_DIR.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_blkcnt_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_blksize_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_clock_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_clockid_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_dev_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_fd_set.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_gid_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_in_addr_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_in_port_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_ino_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_mode_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_nfds_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_nlink_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_off_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_sa_family_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_sigset_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_socklen_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_ssize_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_suseconds_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_time_t.h
+share/wasi-sysroot/include/${TRIPLE}/__typedef_uid_t.h
+share/wasi-sysroot/include/${TRIPLE}/__wasi_snapshot.h
+share/wasi-sysroot/include/${TRIPLE}/alloca.h
+share/wasi-sysroot/include/${TRIPLE}/ar.h
+share/wasi-sysroot/include/${TRIPLE}/arpa/
+share/wasi-sysroot/include/${TRIPLE}/arpa/ftp.h
+share/wasi-sysroot/include/${TRIPLE}/arpa/inet.h
+share/wasi-sysroot/include/${TRIPLE}/arpa/nameser.h
+share/wasi-sysroot/include/${TRIPLE}/arpa/nameser_compat.h
+share/wasi-sysroot/include/${TRIPLE}/arpa/telnet.h
+share/wasi-sysroot/include/${TRIPLE}/arpa/tftp.h
+share/wasi-sysroot/include/${TRIPLE}/assert.h
+share/wasi-sysroot/include/${TRIPLE}/bits/
+share/wasi-sysroot/include/${TRIPLE}/bits/alltypes.h
+share/wasi-sysroot/include/${TRIPLE}/bits/dirent.h
+share/wasi-sysroot/include/${TRIPLE}/bits/fcntl.h
+share/wasi-sysroot/include/${TRIPLE}/bits/fenv.h
+share/wasi-sysroot/include/${TRIPLE}/bits/float.h
+share/wasi-sysroot/include/${TRIPLE}/bits/hwcap.h
+share/wasi-sysroot/include/${TRIPLE}/bits/io.h
+share/wasi-sysroot/include/${TRIPLE}/bits/ioctl.h
+share/wasi-sysroot/include/${TRIPLE}/bits/ioctl_fix.h
+share/wasi-sysroot/include/${TRIPLE}/bits/ipcstat.h
+share/wasi-sysroot/include/${TRIPLE}/bits/limits.h
+share/wasi-sysroot/include/${TRIPLE}/bits/mman.h
+share/wasi-sysroot/include/${TRIPLE}/bits/poll.h
+share/wasi-sysroot/include/${TRIPLE}/bits/posix.h
+share/wasi-sysroot/include/${TRIPLE}/bits/reg.h
+share/wasi-sysroot/include/${TRIPLE}/bits/resource.h
+share/wasi-sysroot/include/${TRIPLE}/bits/setjmp.h
+share/wasi-sysroot/include/${TRIPLE}/bits/signal.h
+share/wasi-sysroot/include/${TRIPLE}/bits/socket.h
+share/wasi-sysroot/include/${TRIPLE}/bits/stat.h
+share/wasi-sysroot/include/${TRIPLE}/bits/stdint.h
+share/wasi-sysroot/include/${TRIPLE}/byteswap.h
+share/wasi-sysroot/include/${TRIPLE}/complex.h
+share/wasi-sysroot/include/${TRIPLE}/cpio.h
+share/wasi-sysroot/include/${TRIPLE}/crypt.h
+share/wasi-sysroot/include/${TRIPLE}/ctype.h
+share/wasi-sysroot/include/${TRIPLE}/dirent.h
+share/wasi-sysroot/include/${TRIPLE}/dlfcn.h
+share/wasi-sysroot/include/${TRIPLE}/endian.h
+share/wasi-sysroot/include/${TRIPLE}/err.h
+share/wasi-sysroot/include/${TRIPLE}/errno.h
+share/wasi-sysroot/include/${TRIPLE}/fcntl.h
+share/wasi-sysroot/include/${TRIPLE}/features.h
+share/wasi-sysroot/include/${TRIPLE}/fenv.h
+share/wasi-sysroot/include/${TRIPLE}/float.h
+share/wasi-sysroot/include/${TRIPLE}/fmtmsg.h
+share/wasi-sysroot/include/${TRIPLE}/fnmatch.h
+share/wasi-sysroot/include/${TRIPLE}/fts.h
+share/wasi-sysroot/include/${TRIPLE}/ftw.h
+share/wasi-sysroot/include/${TRIPLE}/getopt.h
+share/wasi-sysroot/include/${TRIPLE}/glob.h
+share/wasi-sysroot/include/${TRIPLE}/iconv.h
+share/wasi-sysroot/include/${TRIPLE}/ifaddrs.h
+share/wasi-sysroot/include/${TRIPLE}/inttypes.h
+share/wasi-sysroot/include/${TRIPLE}/iso646.h
+share/wasi-sysroot/include/${TRIPLE}/langinfo.h
+share/wasi-sysroot/include/${TRIPLE}/libgen.h
+share/wasi-sysroot/include/${TRIPLE}/limits.h
+share/wasi-sysroot/include/${TRIPLE}/locale.h
+share/wasi-sysroot/include/${TRIPLE}/malloc.h
+share/wasi-sysroot/include/${TRIPLE}/math.h
+share/wasi-sysroot/include/${TRIPLE}/memory.h
+share/wasi-sysroot/include/${TRIPLE}/monetary.h
+share/wasi-sysroot/include/${TRIPLE}/mqueue.h
+share/wasi-sysroot/include/${TRIPLE}/net/
+share/wasi-sysroot/include/${TRIPLE}/netinet/
+share/wasi-sysroot/include/${TRIPLE}/netinet/icmp6.h
+share/wasi-sysroot/include/${TRIPLE}/netinet/igmp.h
+share/wasi-sysroot/include/${TRIPLE}/netinet/in.h
+share/wasi-sysroot/include/${TRIPLE}/netinet/in_systm.h
+share/wasi-sysroot/include/${TRIPLE}/netinet/ip.h
+share/wasi-sysroot/include/${TRIPLE}/netinet/ip6.h
+share/wasi-sysroot/include/${TRIPLE}/netinet/ip_icmp.h
+share/wasi-sysroot/include/${TRIPLE}/netinet/tcp.h
+share/wasi-sysroot/include/${TRIPLE}/netinet/udp.h
+share/wasi-sysroot/include/${TRIPLE}/netpacket/
+share/wasi-sysroot/include/${TRIPLE}/netpacket/packet.h
+share/wasi-sysroot/include/${TRIPLE}/nl_types.h
+share/wasi-sysroot/include/${TRIPLE}/poll.h
+share/wasi-sysroot/include/${TRIPLE}/pthread.h
+share/wasi-sysroot/include/${TRIPLE}/regex.h
+share/wasi-sysroot/include/${TRIPLE}/sched.h
+share/wasi-sysroot/include/${TRIPLE}/scsi/
+share/wasi-sysroot/include/${TRIPLE}/search.h
+share/wasi-sysroot/include/${TRIPLE}/semaphore.h
+share/wasi-sysroot/include/${TRIPLE}/setjmp.h
+share/wasi-sysroot/include/${TRIPLE}/signal.h
+share/wasi-sysroot/include/${TRIPLE}/stdalign.h
+share/wasi-sysroot/include/${TRIPLE}/stdarg.h
+share/wasi-sysroot/include/${TRIPLE}/stdbool.h
+share/wasi-sysroot/include/${TRIPLE}/stdc-predef.h
+share/wasi-sysroot/include/${TRIPLE}/stddef.h
+share/wasi-sysroot/include/${TRIPLE}/stdint.h
+share/wasi-sysroot/include/${TRIPLE}/stdio.h
+share/wasi-sysroot/include/${TRIPLE}/stdio_ext.h
+share/wasi-sysroot/include/${TRIPLE}/stdlib.h
+share/wasi-sysroot/include/${TRIPLE}/stdnoreturn.h
+share/wasi-sysroot/include/${TRIPLE}/string.h
+share/wasi-sysroot/include/${TRIPLE}/strings.h
+share/wasi-sysroot/include/${TRIPLE}/stropts.h
+share/wasi-sysroot/include/${TRIPLE}/sys/
+share/wasi-sysroot/include/${TRIPLE}/sys/dir.h
+share/wasi-sysroot/include/${TRIPLE}/sys/errno.h
+share/wasi-sysroot/include/${TRIPLE}/sys/eventfd.h
+share/wasi-sysroot/include/${TRIPLE}/sys/fcntl.h
+share/wasi-sysroot/include/${TRIPLE}/sys/file.h
+share/wasi-sysroot/include/${TRIPLE}/sys/ioctl.h
+share/wasi-sysroot/include/${TRIPLE}/sys/mman.h
+share/wasi-sysroot/include/${TRIPLE}/sys/param.h
+share/wasi-sysroot/include/${TRIPLE}/sys/poll.h
+share/wasi-sysroot/include/${TRIPLE}/sys/random.h
+share/wasi-sysroot/include/${TRIPLE}/sys/reg.h
+share/wasi-sysroot/include/${TRIPLE}/sys/resource.h
+share/wasi-sysroot/include/${TRIPLE}/sys/select.h
+share/wasi-sysroot/include/${TRIPLE}/sys/signal.h
+share/wasi-sysroot/include/${TRIPLE}/sys/socket.h
+share/wasi-sysroot/include/${TRIPLE}/sys/stat.h
+share/wasi-sysroot/include/${TRIPLE}/sys/statvfs.h
+share/wasi-sysroot/include/${TRIPLE}/sys/stropts.h
+share/wasi-sysroot/include/${TRIPLE}/sys/syscall.h
+share/wasi-sysroot/include/${TRIPLE}/sys/sysinfo.h
+share/wasi-sysroot/include/${TRIPLE}/sys/time.h
+share/wasi-sysroot/include/${TRIPLE}/sys/timeb.h
+share/wasi-sysroot/include/${TRIPLE}/sys/times.h
+share/wasi-sysroot/include/${TRIPLE}/sys/timex.h
+share/wasi-sysroot/include/${TRIPLE}/sys/ttydefaults.h
+share/wasi-sysroot/include/${TRIPLE}/sys/types.h
+share/wasi-sysroot/include/${TRIPLE}/sys/uio.h
+share/wasi-sysroot/include/${TRIPLE}/sys/un.h
+share/wasi-sysroot/include/${TRIPLE}/sys/utsname.h
+share/wasi-sysroot/include/${TRIPLE}/syscall.h
+share/wasi-sysroot/include/${TRIPLE}/sysexits.h
+share/wasi-sysroot/include/${TRIPLE}/tar.h
+share/wasi-sysroot/include/${TRIPLE}/tgmath.h
+share/wasi-sysroot/include/${TRIPLE}/threads.h
+share/wasi-sysroot/include/${TRIPLE}/time.h
+share/wasi-sysroot/include/${TRIPLE}/uchar.h
+share/wasi-sysroot/include/${TRIPLE}/unistd.h
+share/wasi-sysroot/include/${TRIPLE}/utime.h
+share/wasi-sysroot/include/${TRIPLE}/values.h
+share/wasi-sysroot/include/${TRIPLE}/wasi/
+share/wasi-sysroot/include/${TRIPLE}/wasi/api.h
+share/wasi-sysroot/include/${TRIPLE}/wasi/libc-busywait.h
+share/wasi-sysroot/include/${TRIPLE}/wasi/libc-environ.h
+share/wasi-sysroot/include/${TRIPLE}/wasi/libc-find-relpath.h
+share/wasi-sysroot/include/${TRIPLE}/wasi/libc-nocwd.h
+share/wasi-sysroot/include/${TRIPLE}/wasi/libc.h
+share/wasi-sysroot/include/${TRIPLE}/wasi/wasip2.h
+share/wasi-sysroot/include/${TRIPLE}/wchar.h
+share/wasi-sysroot/include/${TRIPLE}/wctype.h
 share/wasi-sysroot/lib/
-share/wasi-sysroot/lib/wasm32-wasi/
-share/wasi-sysroot/lib/wasm32-wasi/crt1-command.o
-share/wasi-sysroot/lib/wasm32-wasi/crt1-reactor.o
-share/wasi-sysroot/lib/wasm32-wasi/crt1.o
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-long-double.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libc-printscan-no-floating-point.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libc.a
-share/wasi-sysroot/lib/wasm32-wasi/libc.imports
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libcrypt.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libdl.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libm.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libpthread.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libresolv.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/librt.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libsetjmp.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libutil.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-getpid.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-mman.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-process-clocks.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libwasi-emulated-signal.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libxnet.a
+share/wasi-sysroot/lib/${TRIPLE}/
+share/wasi-sysroot/lib/${TRIPLE}/crt1-command.o
+share/wasi-sysroot/lib/${TRIPLE}/crt1-reactor.o
+share/wasi-sysroot/lib/${TRIPLE}/crt1.o
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libc-printscan-long-double.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libc-printscan-no-floating-point.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libc.a
+share/wasi-sysroot/lib/${TRIPLE}/libc.imports
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libcrypt.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libdl.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libm.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libpthread.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libresolv.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/librt.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libsetjmp.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libutil.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libwasi-emulated-getpid.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libwasi-emulated-mman.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libwasi-emulated-process-clocks.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libwasi-emulated-signal.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libxnet.a
 share/wasi-sysroot/share/
-share/wasi-sysroot/share/wasm32-wasi/
-share/wasi-sysroot/share/wasm32-wasi/defined-symbols.txt
-share/wasi-sysroot/share/wasm32-wasi/include-all.c
-share/wasi-sysroot/share/wasm32-wasi/predefined-macros.txt
-share/wasi-sysroot/share/wasm32-wasi/undefined-symbols.txt
+share/wasi-sysroot/share/${TRIPLE}/
+share/wasi-sysroot/share/${TRIPLE}/defined-symbols.txt
+share/wasi-sysroot/share/${TRIPLE}/include-all.c
+share/wasi-sysroot/share/${TRIPLE}/predefined-macros.txt
+share/wasi-sysroot/share/${TRIPLE}/undefined-symbols.txt
Index: wasi-sdk/Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/Makefile.inc,v
diff -u -r1.9 Makefile.inc
--- wasi-sdk/Makefile.inc	10 May 2026 11:07:47 -0000	1.9
+++ wasi-sdk/Makefile.inc	11 May 2026 14:02:11 -0000
@@ -4,13 +4,12 @@
 SITES =		https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_V}/
 EXTRACT_SUFX =	.tar.xz
 COMPILER =	ports-clang
-MODCLANG_VERSION=	19
 MODULES =		devel/cmake
 WASI_SYSROOT =	${LOCALBASE}/share/wasi-sysroot
 # https://github.com/WebAssembly/wasi-sdk/issues/52
 CFLAGS +=	-fno-exceptions
 CXXFLAGS +=	-fno-exceptions
-TRIPLE =	wasm32-wasi
+SUBST_VARS +=	TRIPLE
 WRKSRC =	${WRKDIR}/${DISTNAME}/${BUILDSUBDIR}
 
 DISTFILES =	llvm-project-${LLVM_V}.src${EXTRACT_SUFX}
Index: wasi-sdk/compiler-rt/Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/compiler-rt/Makefile,v
diff -u -r1.13 Makefile
--- wasi-sdk/compiler-rt/Makefile	10 May 2026 11:07:47 -0000	1.13
+++ wasi-sdk/compiler-rt/Makefile	11 May 2026 14:02:11 -0000
@@ -2,14 +2,13 @@
 
 DISTNAME =	llvm-project-${LLVM_V}.src
 PKGNAME =	wasi-compiler-rt-${LLVM_V}
-LIBPATH =	wasi/libclang_rt.builtins-wasm32.a
+
 BUILDSUBDIR =	compiler-rt/lib/builtins
-BUILD_DEPENDS +=	lang/wasi-libc>=0.20251114
 
 # In transition from BSD-ish to Apache 2 + LLVM exceptions
 PERMIT_PACKAGE =	Yes
 
-SUBST_VARS +=	MODCLANG_VERSION
+SUBST_VARS +=	MODCLANG_VERSION LIBPATH
 
 CONFIGURE_ARGS=	\
 		-DLLVM_CMAKE_DIR=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib/cmake/llvm \
@@ -23,7 +22,22 @@
 		-DCOMPILER_RT_BAREMETAL_BUILD=ON \
 		-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON \
 		-DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON \
-		-DCOMPILER_RT_INCLUDE_TESTS=OFF \
-		-DCOMPILER_RT_OS_DIR=wasi
+		-DCOMPILER_RT_INCLUDE_TESTS=OFF
+
+FLAVORS =	llvm22
+FLAVOR ?=
+.if ${FLAVOR:Mllvm22}
+BUILD_DEPENDS +=	lang/wasi-libc,${FLAVOR}>=0.20251114
+TRIPLE =	wasm32-unknown-wasip1
+CONFIGURE_ARGS +=	-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON
+LIBPATH =	wasm32-unknown-wasip1/libclang_rt.builtins.a
+MODCLANG_VERSION=	22
+.else
+BUILD_DEPENDS +=	wasi-libc->=0.20251114-!llvm22:lang/wasi-libc
+TRIPLE =	wasm32-wasi
+CONFIGURE_ARGS +=	-DCOMPILER_RT_OS_DIR=wasi
+LIBPATH =	wasi/libclang_rt.builtins-wasm32.a
+MODCLANG_VERSION=	19
+.endif
 
 .include <bsd.port.mk>
Index: wasi-sdk/compiler-rt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/compiler-rt/pkg/PLIST,v
diff -u -r1.3 PLIST
--- wasi-sdk/compiler-rt/pkg/PLIST	18 Nov 2023 07:40:08 -0000	1.3
+++ wasi-sdk/compiler-rt/pkg/PLIST	11 May 2026 14:02:11 -0000
@@ -3,5 +3,5 @@
 llvm${MODCLANG_VERSION}/lib/clang/
 llvm${MODCLANG_VERSION}/lib/clang/${MODCLANG_VERSION}/
 llvm${MODCLANG_VERSION}/lib/clang/${MODCLANG_VERSION}/lib/
-llvm${MODCLANG_VERSION}/lib/clang/${MODCLANG_VERSION}/lib/wasi/
-@static-lib llvm${MODCLANG_VERSION}/lib/clang/${MODCLANG_VERSION}/lib/wasi/libclang_rt.builtins-wasm32.a
+llvm${MODCLANG_VERSION}/lib/clang/${MODCLANG_VERSION}/lib/${TRIPLE}/
+@static-lib llvm${MODCLANG_VERSION}/lib/clang/${MODCLANG_VERSION}/lib/${LIBPATH}
Index: wasi-sdk/libcxx/Makefile
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/libcxx/Makefile,v
diff -u -r1.8 Makefile
--- wasi-sdk/libcxx/Makefile	10 May 2026 11:07:48 -0000	1.8
+++ wasi-sdk/libcxx/Makefile	11 May 2026 14:02:11 -0000
@@ -8,7 +8,18 @@
 # In transition from BSD-ish to Apache 2 + LLVM exceptions
 PERMIT_PACKAGE =	Yes
 
-BUILD_DEPENDS +=	lang/wasi-libc>=0.20251114
+
+FLAVORS =	llvm22
+FLAVOR ?=
+.if ${FLAVOR:Mllvm22}
+BUILD_DEPENDS +=	lang/wasi-libc,${FLAVOR}>=0.20251114
+TRIPLE =	wasm32-wasip1
+MODCLANG_VERSION=	22
+.else
+BUILD_DEPENDS +=	wasi-libc->=0.20251114-!llvm22:lang/wasi-libc
+MODCLANG_VERSION=	19
+TRIPLE =	wasm32-wasi
+.endif
 
 CONFIGURE_ARGS=	\
 		-DLLVM_CMAKE_DIR=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib/cmake/llvm \
Index: wasi-sdk/libcxx/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/wasi-sdk/libcxx/pkg/PLIST,v
diff -u -r1.5 PLIST
--- wasi-sdk/libcxx/pkg/PLIST	10 May 2026 11:07:48 -0000	1.5
+++ wasi-sdk/libcxx/pkg/PLIST	11 May 2026 14:02:11 -0000
@@ -1774,11 +1774,11 @@
 share/wasi-sysroot/include/c++/v1/wchar.h
 share/wasi-sysroot/include/c++/v1/wctype.h
 share/wasi-sysroot/lib/
-share/wasi-sysroot/lib/wasm32-wasi/
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libc++.a
-share/wasi-sysroot/lib/wasm32-wasi/libc++.modules.json
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libc++abi.a
-@static-lib share/wasi-sysroot/lib/wasm32-wasi/libc++experimental.a
+share/wasi-sysroot/lib/${TRIPLE}/
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libc++.a
+share/wasi-sysroot/lib/${TRIPLE}/libc++.modules.json
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libc++abi.a
+@static-lib share/wasi-sysroot/lib/${TRIPLE}/libc++experimental.a
 share/wasi-sysroot/share/
 share/wasi-sysroot/share/libc++/
 share/wasi-sysroot/share/libc++/v1/