pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/wasi-libc wasi-libc: set CLANGBASE instead of PKG...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/6bd767752995
branches:  trunk
changeset: 771670:6bd767752995
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Dec 22 12:47:20 2021 +0000

description:
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.

diffstat:

 lang/wasi-libc/Makefile |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r e5b6291589e8 -r 6bd767752995 lang/wasi-libc/Makefile
--- a/lang/wasi-libc/Makefile   Wed Dec 22 11:46:48 2021 +0000
+++ b/lang/wasi-libc/Makefile   Wed Dec 22 12:47:20 2021 +0000
@@ -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 @@
 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"



Home | Main Index | Thread Index | Old Index