From b3fe229cbae91784bcb972a289653395f48f0025 Mon Sep 17 00:00:00 2001 From: thomas desveaux Date: Fri, 1 Jun 2018 00:33:08 +0200 Subject: [PATCH] gmake*: fix shell type identification --- modules/gmake/gmake.lua | 9 +++------ modules/gmake2/gmake2.lua | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/modules/gmake/gmake.lua b/modules/gmake/gmake.lua index 188bb0788b..4c184d3d67 100644 --- a/modules/gmake/gmake.lua +++ b/modules/gmake/gmake.lua @@ -274,12 +274,9 @@ function make.shellType() - _p('SHELLTYPE := msdos') - _p('ifeq (,$(ComSpec)$(COMSPEC))') - _p(' SHELLTYPE := posix') - _p('endif') - _p('ifeq (/bin,$(findstring /bin,$(SHELL)))') - _p(' SHELLTYPE := posix') + _p('SHELLTYPE := posix') + _p('ifeq (.exe,$(findstring .exe,$(ComSpec)))') + _p('\tSHELLTYPE := msdos') _p('endif') _p('') end diff --git a/modules/gmake2/gmake2.lua b/modules/gmake2/gmake2.lua index 025ebf5021..d6c6ad1f0c 100644 --- a/modules/gmake2/gmake2.lua +++ b/modules/gmake2/gmake2.lua @@ -273,12 +273,9 @@ function gmake2.shellType() - _p('SHELLTYPE := msdos') - _p('ifeq (,$(ComSpec)$(COMSPEC))') - _p(' SHELLTYPE := posix') - _p('endif') - _p('ifeq (/bin,$(findstring /bin,$(SHELL)))') - _p(' SHELLTYPE := posix') + _p('SHELLTYPE := posix') + _p('ifeq (.exe,$(findstring .exe,$(ComSpec)))') + _p('\tSHELLTYPE := msdos') _p('endif') _p('') end