From ba2195b425c9f94a8fce48749a7f44ff0818287d Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Thu, 29 Aug 2019 15:05:38 +0300
Subject: [PATCH 1/3] [CircleCI] Upgrade host dmd version from 2.078.1 to
 2.079.1

The phobos Circle CI build recently started failing, while the dmd one is fine.
The difference is that the dmd build is using has `HOST_DMD_VER` set to `2.079.1`, instead of `2.078.1`.
---
 .circleci/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/run.sh b/.circleci/run.sh
index 85249607662..65b527e315a 100755
--- a/.circleci/run.sh
+++ b/.circleci/run.sh
@@ -2,7 +2,7 @@
 
 set -uexo pipefail
 
-HOST_DMD_VER=2.078.1
+HOST_DMD_VER=2.079.1
 CURL_USER_AGENT="CirleCI $(curl --version | head -n 1)"
 DUB=${DUB:-dub}
 N=2

From de6c26e31012c53c8c1dfa2e8c8e0539d04a81b0 Mon Sep 17 00:00:00 2001
From: Petar Kirov <petar.p.kirov@gmail.com>
Date: Thu, 29 Aug 2019 15:36:36 +0300
Subject: [PATCH 2/3] [circleci] Fix building dmd - use dmd/src/build.d instead
 of dmd/src/posix.mak

PR https://github.com/dlang/dmd/pull/10212 broke building `dmd/src/posix.mak`
with `BUILD=debug`. Use `build.d` instead.
---
 .circleci/run.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/run.sh b/.circleci/run.sh
index 65b527e315a..18137f6b8d7 100755
--- a/.circleci/run.sh
+++ b/.circleci/run.sh
@@ -8,6 +8,7 @@ DUB=${DUB:-dub}
 N=2
 CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
 BUILD="debug"
+PIC=1
 
 case $CIRCLE_NODE_INDEX in
     0) MODEL=64 ;;
@@ -89,7 +90,7 @@ setup_repos()
     source "$(CURL_USER_AGENT=\"$CURL_USER_AGENT\" bash ~/dlang/install.sh dmd-$HOST_DMD_VER --activate)"
 
     # build dmd and druntime
-    make -j$N -C ../dmd/src -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD all
+    pushd ../dmd && ./src/build.d MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD PIC="$PIC" all && popd
     make -j$N -C ../druntime -f posix.mak MODEL=$MODEL HOST_DMD=$DMD BUILD=$BUILD
 }
 

From 2a57ec31b635096e7c5f16b138bfa1ac7fae386e Mon Sep 17 00:00:00 2001
From: ZombineDev <petar.p.kirov@gmail.com>
Date: Thu, 29 Aug 2019 16:50:27 +0300
Subject: [PATCH 3/3] [circleci]: Merge the 'Install gdb' step into
 .circleci/run.sh install_deps

---
 .circleci/config.yml | 3 ---
 .circleci/run.sh     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f981641832f..e5f72f29cb3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,9 +13,6 @@ jobs:
       - run:
           command: ./.circleci/run.sh setup-repos
           name: Clone DMD & DRuntime
-      - run:
-          command: sudo apt-get update && sudo apt-get install -y gdb
-          name: Install gdb
       - run:
           command: ./.circleci/run.sh publictests
           name: Run all public unittests
diff --git a/.circleci/run.sh b/.circleci/run.sh
index 18137f6b8d7..f066221b280 100755
--- a/.circleci/run.sh
+++ b/.circleci/run.sh
@@ -21,7 +21,7 @@ install_deps() {
         sudo apt-get install g++-multilib
     fi
     # required for: "core.time.TimeException@std/datetime/timezone.d(2073): Directory /usr/share/zoneinfo/ does not exist."
-    sudo apt-get install --reinstall tzdata
+    sudo apt-get install --reinstall tzdata gdb
 
     for i in {0..4}; do
         if curl -fsS -A "$CURL_USER_AGENT" --max-time 5 https://dlang.org/install.sh -O ||