CVS commit: pkgsrc/lang/clang

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri May  5 22:47:00 UTC 2017

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

Log Message:
Reduce diff with pkgsrc-wip/clang-git

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


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 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.20 pkgsrc/lang/clang/Makefile.common:1.21
--- pkgsrc/lang/clang/Makefile.common:1.20      Wed May  3 08:38:43 2017
+++ pkgsrc/lang/clang/Makefile.common   Fri May  5 22:47:00 2017
@@ -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 @@ GCC_REQD+=            4.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_STAGE.libcxx=           pre-configure
 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