From 3d5aa49cdd6ccf6526b4f149584af91c60d752bc Mon Sep 17 00:00:00 2001
From: ArkadiuszMichalski <crimsteam@gmail.com>
Date: Mon, 6 Dec 2021 15:45:59 +0100
Subject: [PATCH] Fix build 32-bit binary failure under unix-like shell (Git
 Bash)

Read Windows environment variables correct also for unix-like shell.

Fix #10885, close #10886
---
 PowerEditor/gcc/makefile | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/PowerEditor/gcc/makefile b/PowerEditor/gcc/makefile
index 2d1e4ec68..bcd14ab3a 100644
--- a/PowerEditor/gcc/makefile
+++ b/PowerEditor/gcc/makefile
@@ -64,6 +64,9 @@ endif
 # preparations
 #
 
+# detect Windows directory
+WIN_DIR := $(or $(windir),$(WINDIR))
+
 # detect target CPU
 TARGET_CPU := $(firstword $(subst -, ,$(shell $(CXX) -dumpmachine)))
 ifeq "$(TARGET_CPU)" ""
@@ -75,7 +78,7 @@ endif
 ifeq "$(TARGET_CPU)" "i686"
 # for some reason i686 versions of MinGW-w64 GCC don't include a linking library for SensApi.dll
 # thus it is generated on the fly, but first check if the DLL is available
-ifeq "$(wildcard $(windir)/system32/SensApi.dll)" ""
+ifeq "$(wildcard $(WIN_DIR)/system32/SensApi.dll)" ""
 $(error $(TARGET_CPU) build requires "%windir%/system32/SensApi.dll" to be present)
 endif
 # detect explicit definition of TARGET_CPU via command line to force a 32-bit build
@@ -123,7 +126,7 @@ AT := @
 endif
 
 # detect the current operating system
-ifeq "$(windir)" ""
+ifeq "$(WIN_DIR)" ""
 # not a Windows system
 MKDIR := mkdir -p
 CPDIR := cp -r
@@ -133,11 +136,14 @@ RM := rm -f
 normalize-path = $1
 else ifneq "$(wildcard $(dir $(SHELL))ls.exe)" ""
 # a Windows system with a proper shell
-MKDIR := $(dir $(SHELL))mkdir.exe -p
-CPDIR := $(dir $(SHELL))cp.exe -r
-RMDIR := $(dir $(SHELL))rm.exe -rf
-CP := $(dir $(SHELL))cp.exe
-RM := $(dir $(SHELL))rm.exe -f
+NULL :=
+SPACE := $(NULL) $(NULL)
+SHELL_DIRECTORY := $(subst _,$(SPACE),$(dir $(subst $(SPACE),_,$(SHELL))))
+MKDIR := $(SHELL_DIRECTORY)mkdir.exe -p
+CPDIR := $(SHELL_DIRECTORY)cp.exe -r
+RMDIR := $(SHELL_DIRECTORY)rm.exe -rf
+CP := $(SHELL_DIRECTORY)cp.exe
+RM := $(SHELL_DIRECTORY)rm.exe -f
 normalize-path = $1
 else
 # a standard Windows system
@@ -207,7 +213,7 @@ ifeq "$(TARGET_CPU)" "i686"
 $(TARGET_BINARY): $(BUILD_DIRECTORY)/libsensapi.a
 $(BUILD_DIRECTORY)/libsensapi.a: | $(BUILD_DIRECTORY)
 	@echo * generating $@
-	$(AT)gendef $(call normalize-path,$(firstword $(wildcard $(windir)/syswow64/SensApi.dll $(windir)/system32/SensApi.dll)))
+	$(AT)gendef $(call normalize-path,$(firstword $(wildcard $(WIN_DIR)/syswow64/SensApi.dll $(WIN_DIR)/system32/SensApi.dll)))
 	$(AT)dlltool -mi386 -f--32 -d SensApi.def -k -l $(call normalize-path,$@)
 	$(AT)$(RM) SensApi.def
 endif