[pkgsrc/trunk]: pkgsrc/lang wasi-*: fix build failure when package already in...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4858a7989615
branches:  trunk
changeset: 371227:4858a7989615
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Jan 07 14:33:43 2022 +0000

description:
wasi-*: fix build failure when package already installed

Only use headers that pkgsrc has permitted via buildlink.

diffstat:

 lang/wasi-compiler-rt/Makefile |  4 ++--
 lang/wasi-libcxx/Makefile      |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 848f789ca4ed -r 4858a7989615 lang/wasi-compiler-rt/Makefile
--- a/lang/wasi-compiler-rt/Makefile    Fri Jan 07 13:51:05 2022 +0000
+++ b/lang/wasi-compiler-rt/Makefile    Fri Jan 07 14:33:43 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/07 13:51:05 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/07 14:33:43 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -39,7 +39,7 @@
 CMAKE_ARGS+=   -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
 CMAKE_ARGS+=   -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi
 CMAKE_ARGS+=   -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
-CMAKE_ARGS+=   -DCMAKE_SYSROOT=${PREFIX}/wasi
+CMAKE_ARGS+=   -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
 CMAKE_ARGS+=   -DCOMPILER_RT_BAREMETAL_BUILD=TRUE
 CMAKE_ARGS+=   -DCOMPILER_RT_EXCLUDE_ATOMIC_BUILTIN=TRUE
 CMAKE_ARGS+=   -DCOMPILER_RT_HAS_FPIC_FLAG:BOOL=ON
diff -r 848f789ca4ed -r 4858a7989615 lang/wasi-libcxx/Makefile
--- a/lang/wasi-libcxx/Makefile Fri Jan 07 13:51:05 2022 +0000
+++ b/lang/wasi-libcxx/Makefile Fri Jan 07 14:33:43 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2022/01/07 13:32:48 tnn Exp $
+# $NetBSD: Makefile,v 1.6 2022/01/07 14:33:43 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -52,7 +52,7 @@
 CMAKE_ARGS+=   -DCXX_SUPPORTS_CXX11=ON
 CMAKE_ARGS+=   -DLLVM_COMPILER_CHECKED=ON
 CMAKE_ARGS+=   -DUNIX:BOOL=ON
-CMAKE_ARGS+=   -DCMAKE_SYSROOT=${PREFIX}/wasi
+CMAKE_ARGS+=   -DCMAKE_SYSROOT=${BUILDLINK_DIR}/wasi
 CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER_TARGET=wasm32-wasi
 CMAKE_ARGS+=   -DLLVM_CONFIG_PATH=${PREFIX}/bin/llvm-config
 CMAKE_ARGS+=   -DLIBCXX_LIBDIR_SUFFIX=/wasm32-wasi