diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2023-12-13 18:53:17 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2024-01-07 23:04:42 +0000 |
| commit | 33605894103bd4de4b90790ef40d13595ccab0af (patch) | |
| tree | 778c00ad5a92b6287c2e017b20a664f6afafe6a3 | |
| parent | af05e5589d61acfb9f58611755a16e0c1b975cd1 (diff) | |
| download | src-33605894103bd4de4b90790ef40d13595ccab0af.tar.gz src-33605894103bd4de4b90790ef40d13595ccab0af.zip | |
Proactively remove libc++ __tuple header file that became a directory
This was already handled in ObsoleteFiles.inc (see the 20230622 entry),
but some people never run "make delete-old", or want to upgrade directly
from a revision that still had libc++ 15 to the most recent revision.
They would then encounter a failure during installworld, similar to:
install: target directory `/usr/include/c++/v1/__tuple/' does not exist
Therefore, clean it up in the distrib-cleanup phase, similar to the
earlier instance of the libc++ __string header file that became a
directory.
PR: 273753
MFC after: 1 month
(cherry picked from commit ca217224f17229570f40227893353ca10ae1dda1)
| -rw-r--r-- | etc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/Makefile b/etc/Makefile index 0959fda6a958..9b4b7c93d10a 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -124,6 +124,7 @@ MTREES+= ../${mtree} / # Clean up files that have changed into directories, as mtree cannot handle this # scenario. DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__string +DISTRIB_CLEANUP_FILES+= ${INCLUDEDIR}/c++/v1/__tuple distrib-cleanup: .PHONY for file in ${DISTRIB_CLEANUP_FILES}; do \ if [ -f ${DESTDIR}/$${file} ]; then \ |