mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-22 19:49:34 +00:00
Makefile: support USE_SINGLE_BUILDDIR=OFF without git installed
# Conflicts: # Makefile
This commit is contained in:
parent
3ca5f10fa8
commit
83bb7a9297
1 changed files with 11 additions and 5 deletions
16
Makefile
16
Makefile
|
@ -2,8 +2,12 @@ ANDROID_STANDALONE_TOOLCHAIN_PATH ?= /usr/local/toolchain
|
||||||
MANUAL_SUBMODULES ?= OFF
|
MANUAL_SUBMODULES ?= OFF
|
||||||
|
|
||||||
dotgit=$(shell ls -d .git/config)
|
dotgit=$(shell ls -d .git/config)
|
||||||
ifneq ($(dotgit), .git/config)
|
ifeq ($(dotgit), .git/config)
|
||||||
USE_SINGLE_BUILDDIR=1
|
ifeq ($(shell git --version > /dev/null 2>&1 ; echo $$?), 0)
|
||||||
|
git = yes
|
||||||
|
else
|
||||||
|
$(warning git command not found)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
builddir := build
|
builddir := build
|
||||||
|
@ -13,9 +17,11 @@ ifeq ($(USE_SINGLE_BUILDDIR), OFF)
|
||||||
builddir := $(builddir)/$(os)
|
builddir := $(builddir)/$(os)
|
||||||
topdir := $(topdir)/..
|
topdir := $(topdir)/..
|
||||||
|
|
||||||
branch:=$(shell git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g')
|
ifdef git
|
||||||
builddir := $(builddir)/$(branch)
|
branch := $(shell git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g')
|
||||||
topdir := $(topdir)/..
|
builddir := $(builddir)/$(branch)
|
||||||
|
topdir := $(topdir)/..
|
||||||
|
endif
|
||||||
|
|
||||||
deldirs := $(builddir)
|
deldirs := $(builddir)
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue