Makefile: support USE_SINGLE_BUILDDIR=OFF without git installed

# Conflicts:
#	Makefile
This commit is contained in:
xiphon 2020-11-15 02:37:10 +00:00
parent 3ca5f10fa8
commit 83bb7a9297

View file

@ -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
branch := $(shell git branch | grep '\* ' | cut -f2- -d' '| sed -e 's|[:/\\ \(\)]|_|g')
builddir := $(builddir)/$(branch) builddir := $(builddir)/$(branch)
topdir := $(topdir)/.. topdir := $(topdir)/..
endif
deldirs := $(builddir) deldirs := $(builddir)
else else