From a9ed199d261ec3cb13aba4ecc31035fe81c0c40c Mon Sep 17 00:00:00 2001 From: sthen Date: Fri, 26 Jan 2024 16:35:58 +0000 Subject: [PATCH] remove /mnt/usr/include/c++/v1 before extracting sets, it changed from a file to a dir with the libc++ update to 16. ok deraadt phessler --- distrib/miniroot/install.sub | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 7c2cbf3b258..81c8c258f94 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1257 2023/10/24 18:03:53 naddy Exp $ +# $OpenBSD: install.sub,v 1.1258 2024/01/26 16:35:58 sthen Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer @@ -1784,6 +1784,8 @@ install_files() { rm -rf /mnt/usr/lib/{gcc-lib,clang} rm -rf /mnt/usr/bin/{gcc,g++} rm -rf /mnt/usr/include/g++ + # file changed to dir in libc++ + rm -rf /mnt/usr/include/c++/v1 fi rm -rf /mnt/var/syspatch/* fi -- 2.20.1