From: John Marino <draco@marino.st>
Date: Sat, 28 Sep 2013 09:02:49 +0000 (+0200)
Subject: Makefile.inc1: Fix build when MAKEOBJDIRPREFIX is provided
X-Git-Tag: v3.7.0~275
X-Git-Url: https://gitweb.dragonflybsd.org/~tuxillo/dragonfly.git/commitdiff_plain/75d86d8d3ad8755e4a3bfb102fa5236cb2d59c38

Makefile.inc1: Fix build when MAKEOBJDIRPREFIX is provided

While testing a patch that removed symbols from libc, Joris found his
build would break on leaf with MAKEOBJDIRPREFIX set in the command-line.
While this is a misuse of the feature per bsd.obj.mk comments, the issue
was reproduced on my machine.  The object files from btools, ctools, and
world were getting placed in common directories, so world binaries were
being built with bootstrap and crosstools objects.

I do not know if this has always been the case, or if this started
happening when bmake replaced legacy make.  In any case, changing the
way DESTDIRBASE is defined solved the build issues on the local machine.
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8b2fadf7b4..33e4b0a565 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -118,7 +118,7 @@ OBJTREE?=		${MAKEOBJDIRPREFIX}
 
 # Used for stage installs and pathing
 #
-DESTDIRBASE?=		${OBJTREE}${.CURDIR}
+DESTDIRBASE:=		${OBJTREE}${.CURDIR}
 
 # Remove DESTDIR from MAKEFLAGS.  It is present in the environment
 # anyhow, and we need to be able to override it for stage installs