diff options
| author | schmonz <schmonz@pkgsrc.org> | 2014-12-10 14:29:21 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2014-12-10 14:29:21 +0000 |
| commit | 1f4e6ab3deb3d81527a06ee6e142733955948e7a (patch) | |
| tree | 207577db86cd7a0efc727a079de020b5186bbfdc /mk | |
| parent | f518dbaba599b881012b5e4de62f8d619b7c3730 (diff) | |
| download | pkgsrc-1f4e6ab3deb3d81527a06ee6e142733955948e7a.tar.gz | |
Remove "CC" from CWRAPPERS_ALIASES.cxx.
Motivation: with "USE_CWRAPPERS=yes" on the default case-insensitive
OS X filesystem, linking the wrappers was failing, stopping the
build. For example:
===> Creating toolchain wrappers for mess822-0.58nb3
ln: .../pkgsrc-current/mail/mess822/work/.cwrapper/bin/cc: File exists
*** Error code 1
Stop.
I never noticed this with the old wrappers, but they've also been
failing to link "CC" as an alias to "c++"; it's just that the failure
has been silent and I've never noticed a build failure for lack of
a "CC" wrapper, despite there probably never having been such a
wrapper.
Given that jperkin's SmartOS bulk build with this change produced
results similar to last week's non-cwrappers trunk build, we can
conclude that across platforms, the need for a "CC" wrapper is very
limited and we needn't try (and sometimes fail) to create one by
default.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/cwrappers.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/cwrappers.mk b/mk/cwrappers.mk index 89816e6a32e..b33fe62170b 100644 --- a/mk/cwrappers.mk +++ b/mk/cwrappers.mk @@ -1,4 +1,4 @@ -# $NetBSD: cwrappers.mk,v 1.16 2014/12/09 12:50:24 joerg Exp $ +# $NetBSD: cwrappers.mk,v 1.17 2014/12/10 14:29:21 schmonz Exp $ # # This Makefile fragment implements integration of pkgtools/cwrappers. @@ -26,7 +26,7 @@ CWRAPPERS_CONFIG.shlibtool= shlibtool CWRAPPERS_ALIASES.as= as CWRAPPERS_ALIASES.cc= cc gcc clang -CWRAPPERS_ALIASES.cxx= c++ g++ CC cxx clang++ +CWRAPPERS_ALIASES.cxx= c++ g++ cxx clang++ CWRAPPERS_ALIASES.cpp= cpp clang-cpp CWRAPPERS_ALIASES.f77= f77 g77 CWRAPPERS_ALIASES.imake= imake |