Merge pull request #1103 from tdesveauxPKFX/fix-makefile-shelltype

gmake*: fix shell type identification
premake · Jun 3, 2018 · 9c6e195 · 9c6e195
2 parents d6dfaa3 + 7ba491c
commit 9c6e195
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git 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
@@ -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