CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan  7 14:33:43 UTC 2022

Modified Files:
        pkgsrc/lang/wasi-compiler-rt: Makefile
        pkgsrc/lang/wasi-libcxx: Makefile

Log Message:
wasi-*: fix build failure when package already installed

Only use headers that pkgsrc has permitted via buildlink.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/wasi-compiler-rt/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/wasi-libcxx/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-compiler-rt/Makefile
diff -u pkgsrc/lang/wasi-compiler-rt/Makefile:1.5 pkgsrc/lang/wasi-compiler-rt/Makefile:1.6
--- pkgsrc/lang/wasi-compiler-rt/Makefile:1.5   Fri Jan  7 13:51:05 2022
+++ pkgsrc/lang/wasi-compiler-rt/Makefile       Fri Jan  7 14:33:43 2022
@@ -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+=  -DCOMPILER_RT_OS_DIR:STRING
 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

Index: pkgsrc/lang/wasi-libcxx/Makefile
diff -u pkgsrc/lang/wasi-libcxx/Makefile:1.5 pkgsrc/lang/wasi-libcxx/Makefile:1.6
--- pkgsrc/lang/wasi-libcxx/Makefile:1.5        Fri Jan  7 13:32:48 2022
+++ pkgsrc/lang/wasi-libcxx/Makefile    Fri Jan  7 14:33:43 2022
@@ -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+=  -DCMAKE_CXX_COMPILER_WORKS=
 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