From 16b06c4d68fcad62514ec38bca54f5be82168ddd Mon Sep 17 00:00:00 2001
From: Martin Nowak <code@dawg.eu>
Date: Sun, 25 Jun 2017 15:38:22 +0200
Subject: [PATCH 1/2] fix support of relative variable overrides

---
 posix.mak | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/posix.mak b/posix.mak
index 9d86800353..b662ea5a4e 100644
--- a/posix.mak
+++ b/posix.mak
@@ -20,12 +20,12 @@ endif
 NEXT_VERSION:=$(shell bash -c 'version=$$(cat VERSION);a=($${version//./ });a[1]="10\#$${a[1]}";((a[1]++)); a[2]=0; echo $${a[0]}.0$${a[1]}.$${a[2]};' )
 
 # DLang directories
-DMD_DIR=$(PWD)/../dmd
-PHOBOS_DIR=$(PWD)/../phobos
-DRUNTIME_DIR=$(PWD)/../druntime
-TOOLS_DIR=$(PWD)/../tools
-INSTALLER_DIR=$(PWD)/../installer
-DUB_DIR=$(PWD)/../dub-${DUB_VER}
+DMD_DIR=../dmd
+PHOBOS_DIR=../phobos
+DRUNTIME_DIR=../druntime
+TOOLS_DIR=../tools
+INSTALLER_DIR=../installer
+DUB_DIR=../dub-${DUB_VER}
 
 # External binaries
 DMD=$(DMD_DIR)/generated/$(OS)/release/$(MODEL)/dmd
@@ -113,16 +113,16 @@ endif
 DDOC_VARS_STABLE=\
 	  DOC_OUTPUT_DIR="${DOC_OUTPUT_DIR}/phobos" \
 	  STDDOC="$(addprefix $(PWD)/, $(STD_DDOC))" \
-	  DMD="$(DMD_STABLE)" \
-	  DRUNTIME_PATH="${DRUNTIME_DIR}" \
+	  DMD="$(abspath $(DMD_STABLE))" \
+	  DRUNTIME_PATH="$(abspath ${DRUNTIME_DIR})" \
 	  DOCSRC="$(PWD)" \
-	  VERSION="${DMD_DIR}/VERSION"
+	  VERSION="$(abspath ${DMD_DIR}/VERSION)"
 
 DDOC_VARS=\
-	DMD="${DMD}" \
-	DRUNTIME_PATH="${DRUNTIME_DIR}" \
+	DMD="$(abspath ${DMD})" \
+	DRUNTIME_PATH="$(abspath ${DRUNTIME_DIR})" \
 	DOCSRC="$(PWD)" \
-	VERSION="${DMD_DIR}/VERSION"
+	VERSION="$(abspath ${DMD_DIR}/VERSION)"
 
 DDOC_VARS_HTML=$(DDOC_VARS) \
 	DOC_OUTPUT_DIR="${DOC_OUTPUT_DIR}/phobos-prerelease" \

From 2efc3fd173581c158c7393292a58a45ca2b3722c Mon Sep 17 00:00:00 2001
From: Martin Nowak <code@dawg.eu>
Date: Mon, 26 Jun 2017 12:50:33 +0200
Subject: [PATCH 2/2] fix clone targets

- broken by 4129e45951 which changed target folders from
  ../druntime-2.074.1 to $PWD/druntime-2.074.1
- no need to make those targets absolute since the makefile will
  always run in the dlang.org root folder
---
 posix.mak | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/posix.mak b/posix.mak
index b662ea5a4e..b18204f815 100644
--- a/posix.mak
+++ b/posix.mak
@@ -381,10 +381,10 @@ dlangspec.verbatim.txt : $(DMD) verbatim.ddoc dlangspec-consolidated.d
 # Git rules
 ################################################################################
 
-$(PWD)/%-${LATEST} :
+../%-${LATEST} :
 	git clone -b v${LATEST} --depth=1 ${GIT_HOME}/$(notdir $*) $@
 
-$(PWD)/%-${DUB_VER} :
+../%-${DUB_VER} :
 	git clone --depth=1 -b v${DUB_VER} ${GIT_HOME}/$(notdir $*) $@
 
 ${DMD_DIR} ${DRUNTIME_DIR} ${PHOBOS_DIR} ${TOOLS_DIR} ${INSTALLER_DIR}: