aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2018-10-26 22:14:26 +0200
committerRiccardo Spagni <ric@spagni.net>2018-10-26 22:14:27 +0200
commitab6c17cc154914df61778ad48577ed70d8b03f88 (patch)
treef3f23de07c1fc384387dbfba331af886c743344e
parentMerge pull request #4705 (diff)
parentMakefile: fix building without a git tree (diff)
downloadmonero-ab6c17cc154914df61778ad48577ed70d8b03f88.tar.xz
Merge pull request #4716
0406724c Makefile: fix building without a git tree (moneromooo-monero)
Diffstat (limited to '')
-rw-r--r--Makefile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 40b8839cc..f9270ebf2 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,11 @@
ANDROID_STANDALONE_TOOLCHAIN_PATH ?= /usr/local/toolchain
+dotgit=$(shell ls -d .git/config)
+ifneq ($(dotgit), .git/config)
+ USE_SINGLE_BUILDDIR=1
+endif
+
subbuilddir:=$(shell echo `uname | sed -e 's|[:/\\ \(\)]|_|g'`/`git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g'`)
ifeq ($(USE_SINGLE_BUILDDIR),)
builddir := build/"$(subbuilddir)"