From 4ae5cdb8c8f2fe2788ada3a6f62ae8baf7fed587 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Sun, 8 Aug 2010 23:37:56 -0500
Subject: [PATCH] script/makeworld: give the build its own obj directory, for
 possible alternate installworld/installkernel runs

---
 script/makeworld | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/script/makeworld b/script/makeworld
index 13aba06..2ee8046 100755
--- a/script/makeworld
+++ b/script/makeworld
@@ -64,12 +64,13 @@ prepare() {
   mkdir -p "${build}/usr/obj" || wtf
 
   meh "Mounting chroot directories"
+  mkdir -p "${world}/obj"
   mkdir -p "${world}/root"
   mount -t devfs devfs "${build}/dev" || wtf
   # Mount /usr/src as a union, so that changes to it will not affect the underlying tree
   # unionfs suffers from deadlocks; don't use it
   mount -t nullfs -r /usr/src "${build}/usr/src" || wtf
-  mount -t nullfs /usr/obj "${build}/usr/obj" || wtf
+  mount -t nullfs "${world}/obj" "${build}/usr/obj" || wtf
   mount -t nullfs "${world}/root" "${build}/mnt" || wtf
 
   if [ -d "${world}/config" ]
-- 
2.42.0