Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4715 

9168fc9f Makefile: fix building without a git tree (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-10-26 22:14:50 +02:00
parent 1e74586ee9 9168fc9f78
commit affab99b8a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -28,6 +28,11 @@
ANDROID_STANDALONE_TOOLCHAIN_PATH ?= /usr/local/toolchain 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'`) subbuilddir:=$(shell echo `uname | sed -e 's|[:/\\ \(\)]|_|g'`/`git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g'`)
ifeq ($(USE_SINGLE_BUILDDIR),) ifeq ($(USE_SINGLE_BUILDDIR),)
builddir := build/"$(subbuilddir)" builddir := build/"$(subbuilddir)"