[pkgsrc/trunk]: pkgsrc/lang/clang Reduce diff with pkgsrc-wip/clang-git

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e91fd3ebfe1a
branches:  trunk
changeset: 362136:e91fd3ebfe1a
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Fri May 05 22:47:00 2017 +0000

description:
Reduce diff with pkgsrc-wip/clang-git

This also fixes linking with libstdc++ in clang and should make it usable.

diffstat:

 lang/clang/Makefile.common |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 832f64c748de -r e91fd3ebfe1a lang/clang/Makefile.common
--- a/lang/clang/Makefile.common        Fri May 05 21:46:50 2017 +0000
+++ b/lang/clang/Makefile.common        Fri May 05 22:47:00 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2017/05/03 08:38:43 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.21 2017/05/05 22:47:00 kamil Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-static-analyzer/Makefile
 
@@ -23,8 +23,8 @@
 
 CMAKE_ARGS+=   -DLLVM_CONFIG=${LLVM_CONFIG_PATH}
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
-CMAKE_ARGS+=   -DCMAKE_C_COMPILER=gcc
-CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=g++
+CMAKE_ARGS+=   -DCMAKE_C_COMPILER=${CC:Q}
+CMAKE_ARGS+=   -DCMAKE_CXX_COMPILER=${CXX:Q}
 # XXX can't disable static-analyzer without also disabling ARCMT
 CMAKE_ARGS+=   -DCLANG_ENABLE_ARCMT=OFF
 
@@ -81,7 +81,7 @@
 SUBST_MESSAGE.libcxx=          Patching toolchain to use libstdc++ (matching the host compiler)
 SUBST_FILES.libcxx=            lib/Driver/ToolChains.cpp
 SUBST_FILES.libcxx+=           lib/Driver/Tools.cpp
-SUBST_SED.libcxx=              -e 's,(Major >= 7 || (Major == 6 && Minor == 99 && Micro >= 49) || Major == 0),(false),'
+SUBST_SED.libcxx=              -e 's,(Major >= 7 || Major == 0),(false),'
 
 CMAKE_ARGS+=                   -DCLANG_DEFAULT_CXX_STDLIB:STRING="libstdc++"
 .endif