CVS commit: pkgsrc/lang/clang

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Apr 26 10:19:27 UTC 2020

Modified Files:
        pkgsrc/lang/clang: Makefile.common

Log Message:
lang/clang: avoid unnecessary shell command

The "echo NO" is not necessary since the output of the shell command is
immediately inspected. Therefore there is no need to use the :sh
modifier.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/lang/clang/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/clang/Makefile.common
diff -u pkgsrc/lang/clang/Makefile.common:1.42 pkgsrc/lang/clang/Makefile.common:1.43
--- pkgsrc/lang/clang/Makefile.common:1.42      Sat Apr 18 07:53:38 2020
+++ pkgsrc/lang/clang/Makefile.common   Sun Apr 26 10:19:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2020/04/18 07:53:38 adam Exp $
+# $NetBSD: Makefile.common,v 1.43 2020/04/26 10:19:26 rillig Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-static-analyzer/Makefile
 # used by lang/clang-tools-extra/Makefile
@@ -69,15 +69,22 @@ REPLACE_PYTHON+=    utils/hmaptool/hmaptool
 REPLACE_PYTHON+=       utils/token-delta.py
 REPLACE_PYTHON+=       www/builtins.py
 
-.if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mclang)
+.if ${OPSYS} == "NetBSD" && ${PKGSRC_COMPILER:Mclang}
 # command to check if clang is using libc++ or libstdc++
-LIBCPP_CHECK_SH=       printf "\#include <ciso646>\n\#ifdef _LIBCPP_VERSION\nYES\n\#endif" | ${CLANGBASE}/bin/clang++ -x c++ -E - 2>&1 | grep YES || true
+LIBCPP_CHECK!= \
+       printf '%s\n' \
+               '\#include <ciso646>' \
+               '\#ifdef _LIBCPP_VERSION' \
+               'YES' \
+               '\#endif' \
+       | ${CLANGBASE}/bin/clang++ -x c++ -E - 2>&1 \
+       | grep YES || true
 .else
-LIBCPP_CHECK_SH=       echo NO
+LIBCPP_CHECK=  NO
 .endif
 
 # patch NetBSD::GetCXXStdlibType
-.if ${OPSYS} == "NetBSD" && empty(LIBCPP_CHECK_SH:sh:MYES)
+.if ${OPSYS} == "NetBSD" && ${LIBCPP_CHECK} == YES
 SUBST_CLASSES+=                        libcxx
 SUBST_STAGE.libcxx=            pre-configure
 SUBST_MESSAGE.libcxx=          Patching toolchain to use libstdc++ (matching the host compiler)