Remove -a from uname

This commit is contained in:
meepingsnesroms 2018-01-05 09:58:10 -08:00
parent 0598f2e7c8
commit 69bb95c49b
2 changed files with 8 additions and 8 deletions

View File

@ -177,9 +177,9 @@ NM := $(PREFIX)nm
LD := $(CXX) LD := $(CXX)
ifeq ($(strip $(CTRBANNERTOOL)),) ifeq ($(strip $(CTRBANNERTOOL)),)
ifneq ($(findstring Linux,$(shell uname -a)),) ifneq ($(findstring Linux,$(shell uname)),)
BANNERTOOL = pkg/ctr/tools/bannertool-linux BANNERTOOL = pkg/ctr/tools/bannertool-linux
else ifneq ($(findstring Darwin,$(shell uname -a)),) else ifneq ($(findstring Darwin,$(shell uname)),)
BANNERTOOL = pkg/ctr/tools/bannertool-mac BANNERTOOL = pkg/ctr/tools/bannertool-mac
else else
BANNERTOOL = pkg/ctr/tools/bannertool.exe BANNERTOOL = pkg/ctr/tools/bannertool.exe
@ -189,9 +189,9 @@ else
endif endif
ifeq ($(strip $(CTRMAKEROM)),) ifeq ($(strip $(CTRMAKEROM)),)
ifneq ($(findstring Linux,$(shell uname -a)),) ifneq ($(findstring Linux,$(shell uname)),)
MAKEROM = pkg/ctr/tools/makerom-linux MAKEROM = pkg/ctr/tools/makerom-linux
else ifneq ($(findstring Darwin,$(shell uname -a)),) else ifneq ($(findstring Darwin,$(shell uname)),)
MAKEROM = pkg/ctr/tools/makerom-mac MAKEROM = pkg/ctr/tools/makerom-mac
else else
MAKEROM = pkg/ctr/tools/makerom.exe MAKEROM = pkg/ctr/tools/makerom.exe

View File

@ -123,9 +123,9 @@ NM := $(PREFIX)nm
LD := $(CXX) LD := $(CXX)
ifeq ($(strip $(CTRBANNERTOOL)),) ifeq ($(strip $(CTRBANNERTOOL)),)
ifneq ($(findstring Linux,$(shell uname -a)),) ifneq ($(findstring Linux,$(shell uname)),)
BANNERTOOL = pkg/ctr/tools/bannertool-linux BANNERTOOL = pkg/ctr/tools/bannertool-linux
else ifneq ($(findstring Darwin,$(shell uname -a)),) else ifneq ($(findstring Darwin,$(shell uname)),)
BANNERTOOL = pkg/ctr/tools/bannertool-mac BANNERTOOL = pkg/ctr/tools/bannertool-mac
else else
BANNERTOOL = pkg/ctr/tools/bannertool.exe BANNERTOOL = pkg/ctr/tools/bannertool.exe
@ -135,9 +135,9 @@ else
endif endif
ifeq ($(strip $(CTRMAKEROM)),) ifeq ($(strip $(CTRMAKEROM)),)
ifneq ($(findstring Linux,$(shell uname -a)),) ifneq ($(findstring Linux,$(shell uname)),)
MAKEROM = pkg/ctr/tools/makerom-linux MAKEROM = pkg/ctr/tools/makerom-linux
else ifneq ($(findstring Darwin,$(shell uname -a)),) else ifneq ($(findstring Darwin,$(shell uname)),)
MAKEROM = pkg/ctr/tools/makerom-mac MAKEROM = pkg/ctr/tools/makerom-mac
else else
MAKEROM = pkg/ctr/tools/makerom.exe MAKEROM = pkg/ctr/tools/makerom.exe