summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Henderson <sthen@cvs.openbsd.org>2024-01-26 16:35:59 +0000
committerStuart Henderson <sthen@cvs.openbsd.org>2024-01-26 16:35:59 +0000
commite13c03243afe0ed7606fa1cfd8ea86718bccbfd6 (patch)
treebf54eef7110bd6d5df5c1d3401949a66842b1a2f
parente4a2fccd73a8246499e57c467cc845307a16e1e1 (diff)
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
-rw-r--r--distrib/miniroot/install.sub4
1 files changed, 3 insertions, 1 deletions
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 <rpe@openbsd.org>
@@ -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