CVS commit: pkgsrc/lang/wasi-compiler-rt

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Fri Jan  7 13:51:05 UTC 2022

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

Log Message:
wasi-compiler-rt: don't circumvent pkgsrc wrappers

Fixes build failure on Linux due to BUILDLINK_TRANSFORM not kicking in.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/wasi-compiler-rt/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.4 pkgsrc/lang/wasi-compiler-rt/Makefile:1.5
--- pkgsrc/lang/wasi-compiler-rt/Makefile:1.4   Fri Jan  7 13:32:47 2022
+++ pkgsrc/lang/wasi-compiler-rt/Makefile       Fri Jan  7 13:51:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/07 13:32:47 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/07 13:51:05 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -32,9 +32,9 @@ BUILDLINK_TRANSFORM+= rm:-I${PREFIX}/inc
 CMAKE_ARGS+=   -DCMAKE_VERBOSE_MAKEFILE=1
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${PREFIX}/bin/clang
-CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${PREFIX}/bin/clang++
-CMAKE_ARGS+=   -DCOMPILER_RT_TEST_COMPILER=${PREFIX}/bin/clang
+CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
+CMAKE_ARGS+=   -DCOMPILER_RT_TEST_COMPILER=${CC:Q}
 CMAKE_ARGS+=   -DCOMPILER_RT_OS_DIR:STRING=wasi
 CMAKE_ARGS+=   -DLLVM_CONFIG_PATH=${LLVM_CONFIG_PATH:Q}
 CMAKE_ARGS+=   -DCOMPILER_RT_DEFAULT_TARGET_TRIPLE=wasm32-wasi