diff options
author | peter <peter@FreeBSD.org> | 2002-05-29 03:59:20 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2002-05-29 03:59:20 +0000 |
commit | 4a482ef2e95036c927bce3e85700c2947cc1ffc4 (patch) | |
tree | 0d34abcc07b6480510d0ec8ca193a97e33201d74 /Makefile.inc1 | |
parent | 4ba107a215d0849862ae60b64dba207294b09197 (diff) | |
download | FreeBSD-src-4a482ef2e95036c927bce3e85700c2947cc1ffc4.zip FreeBSD-src-4a482ef2e95036c927bce3e85700c2947cc1ffc4.tar.gz |
Bandaid for helping people who have a broken /usr/bin/c++ installation.
This only affects the -current early adopters and developers who have
done a 'make world' in the last few weeks and as a result installed a
gcc-3.1 version of /usr/bin/c++ but without the corresponding library
support that this now requires. This is a temporary hack that should be
deleted within a few weeks. In this case we will use the existing
gperf/groff one last time around for the early stage1 bootstrap. (This
isn't so bad, because we were unconditionally using the host one before)
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 9e17fa4..5df999d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -572,7 +572,11 @@ installmost: .if exists(${.CURDIR}/games) && !defined(NOGAMES) _strfile= games/fortune/strfile .endif +# This horrible kludge should be deleted in about 2 weeks, say July 9, 2002 +_cxx_version!= ${CXX} -v 2>&1 | awk '$$0 ~ /^gcc version/ {print $$3}' +.if ${CXX:T} != "c++" || ${_cxx_version} != "3.1" || exists(/usr/lib/libstdc++.so.4) _cxx_consumers= gnu/usr.bin/gperf gnu/usr.bin/groff +.endif bootstrap-tools: .for _tool in ${_strfile} usr.bin/yacc usr.bin/colldef \ |