diff options
| author | kamil <kamil@pkgsrc.org> | 2017-05-05 22:47:00 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2017-05-05 22:47:00 +0000 |
| commit | 19c875acc406b1b004be96225da55695f26bd580 (patch) | |
| tree | 791f4223d711aaa6dd5ae072f4b254d729955c37 /lang/clang | |
| parent | 471e7e5ed61c2cd8bab8a96d745ba6b5a7cf2a3e (diff) | |
| download | pkgsrc-19c875acc406b1b004be96225da55695f26bd580.tar.gz | |
Reduce diff with pkgsrc-wip/clang-git
This also fixes linking with libstdc++ in clang and should make it usable.
Diffstat (limited to 'lang/clang')
| -rw-r--r-- | lang/clang/Makefile.common | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lang/clang/Makefile.common b/lang/clang/Makefile.common index 4c30b4e0146..e55ee763f68 100644 --- a/lang/clang/Makefile.common +++ b/lang/clang/Makefile.common @@ -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 |