CVS commit: pkgsrc/lang/wasi-libc

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Dec 22 12:47:20 UTC 2021

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

Log Message:
wasi-libc: set CLANGBASE instead of PKG_CC/CXX

Otherwise it breaks when user has CLANGBASE=/usr in mk.conf.
Also set PKG_FAIL_REASON when llvm doesn't have llvm-target-webassembly.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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.1 pkgsrc/lang/wasi-libc/Makefile:1.2
--- pkgsrc/lang/wasi-libc/Makefile:1.1  Sun Dec 19 13:38:56 2021
+++ pkgsrc/lang/wasi-libc/Makefile      Wed Dec 22 12:47:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2021/12/19 13:38:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/22 12:47:20 tnn Exp $
 
 GITHUB_PROJECT=        wasi-libc
 GITHUB_TAG=    ad5133410f66b93a2381db5b542aad5e0964db96
@@ -36,10 +36,12 @@ MAKE_FLAGS+=        INSTALL_DIR=${DESTDIR}${PRE
 BUILD_TARGET=  finish
 
 PKGSRC_COMPILER=       clang
-PKG_CC=                ${PREFIX}/bin/clang
-PKG_CXX=       ${PREFIX}/bin/clang++
+CLANGBASE=             ${PREFIX}
 BUILDLINK_DEPMETHOD.clang=     build
 .include "../../lang/clang/buildlink3.mk"
 BUILDLINK_DEPMETHOD.llvm=      build
 .include "../../lang/llvm/buildlink3.mk"
+.if empty(PKG_BUILD_OPTIONS.llvm:Mllvm-target-webassembly)
+PKG_FAIL_REASON+=      "llvm-target-webassembly PKG_OPTION must be enabled in lang/llvm"
+.endif
 .include "../../mk/bsd.pkg.mk"