commit d99cc757b73cf2a47ca99f3c24f513d7bac7d0c6
author Fuad Tabba <tabba@google.com> Mon Aug 17 11:31:56 2020 +0000
committer Fuad Tabba <tabba@google.com> Mon Aug 17 11:31:56 2020 +0000
tree dad16b65e3b6af1105e848335efb5e7eb679344f
parent e26777933431f49b8f33aad151e579694c4a86db

Use DIST_DIR as the OUT_DIR when set

The CI system (pKVM/Busytown) provides a DIST_DIR for each build
to store its compilation artifacts. Use that as the OUT_DIR when
set.

https://critique-ng.corp.google.com/cl/326740710

Bug: 157107453

Signed-off-by: Fuad Tabba <tabba@google.com>
Change-Id: I7f1ca1a324f9368cd9fa89fde45870e8c86a6b25

Makefile

diff --git a/Makefile b/Makefile
index 8c71dd1..9b6507a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,14 @@
 ## Folders
 ##
 ROOT_DIR := $(CURDIR)
+
+# DIST_DIR might be defined by the CI build (pKVM Busytown)
+ifdef DIST_DIR
+OUT_DIR := $(DIST_DIR)
+else
 OUT_DIR := $(ROOT_DIR)/out
+endif
+
 LINUX_OUT := $(OUT_DIR)/linux
 CCACHE_DIR := $(OUT_DIR)/.ccache
 SCRIPTS_DIR := $(ROOT_DIR)/build