CVS commit: pkgsrc/lang/wasi-libc

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Jan 10 00:00:05 UTC 2022

Modified Files:
        pkgsrc/lang/wasi-libc: Makefile

Log Message:
wasi-libc: fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/wasi-libc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/wasi-libc/Makefile
diff -u pkgsrc/lang/wasi-libc/Makefile:1.6 pkgsrc/lang/wasi-libc/Makefile:1.7
--- pkgsrc/lang/wasi-libc/Makefile:1.6  Sun Jan  9 23:42:03 2022
+++ pkgsrc/lang/wasi-libc/Makefile      Mon Jan 10 00:00:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/09 23:42:03 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/10 00:00:05 tnn Exp $
 
 GITHUB_PROJECT=        wasi-libc
 GITHUB_TAG=    ad5133410f66b93a2381db5b542aad5e0964db96
@@ -37,6 +37,11 @@ MAKE_FLAGS+= WASM_NM=${PREFIX}/bin/llvm-
 MAKE_FLAGS+=   INSTALL_DIR=${DESTDIR}${PREFIX}/wasi
 BUILD_TARGET=  finish
 
+# iconv.h from libiconv get pulled in on SunOS (via clang)
+# It conflicts with musl libc so must be removed.
+pre-configure:
+       rm -f ${BUILDLINK_DIR}/include/iconv.h
+
 ABI=                   # 32
 CFLAGS=                        -O2
 CXXFLAGS=              -O2