Merge pull request #88 from sergiobenrocha2/master

Swap these conditions, otherwise Darwin gets matched as win & fails b…
This commit is contained in:
Twinaphex 2017-09-21 18:49:16 +02:00 committed by GitHub
commit 4b98cd4d8a

View File

@ -11,15 +11,15 @@ filter_out2 = $(call filter_out1,$(call filter_out1,$1))
# system platform
ifeq ($(platform),)
platform = unix
ifeq ($(shell uname -a),)
ifeq ($(shell uname -s),)
EXE_EXT = .exe
platform = win
else ifneq ($(findstring MINGW,$(shell uname -a)),)
else ifneq ($(findstring MINGW,$(shell uname -s)),)
platform = win
else ifneq ($(findstring win,$(shell uname -a)),)
platform = win
else ifneq ($(findstring Darwin,$(shell uname -a)),)
else ifneq ($(findstring Darwin,$(shell uname -s)),)
platform = osx
else ifneq ($(findstring win,$(shell uname -s)),)
platform = win
endif
else ifneq (,$(findstring armv,$(platform)))
override platform += unix