diff --git a/Makefile b/Makefile index 8cacecce4c..8e1098b199 100644 --- a/Makefile +++ b/Makefile @@ -1104,12 +1104,17 @@ endif endif export ZIPPROG ifndef TARPROG +TARPROG:=$(strip $(wildcard $(addsuffix /gtar$(SRCEXEEXT),$(SEARCHPATH)))) +ifeq ($(TARPROG),) TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)))) ifeq ($(TARPROG),) TARPROG= __missing_command_TARPROG else TARPROG:=$(firstword $(TARPROG)) endif +else +TARPROG:=$(firstword $(TARPROG)) +endif endif export TARPROG ASNAME=$(BINUTILSPREFIX)as diff --git a/utils/fpcm/fpcmwr.pp b/utils/fpcm/fpcmwr.pp index 59358726cb..a662f9494d 100644 --- a/utils/fpcm/fpcmwr.pp +++ b/utils/fpcm/fpcmwr.pp @@ -612,7 +612,7 @@ implementation AddTool('PPUMOVE','ppumove',''); AddTool('FPCMAKE','fpcmake',''); AddTool('ZIPPROG','zip',''); - AddTool('TARPROG','tar',''); + AddTool('TARPROG','gtar','tar'); AddIniSection('defaulttools'); end;