X-Git-Url: https://ecere.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=crossplatform.mk;h=442f64dd02bbd6a7c26470f5f6f6729f4c460f47;hb=2d77fea98162023230873156459bbcc93677e115;hp=bfe31a0e0d0e558ccf9d5b1a7ae28a7fd7302e8a;hpb=054f1cb29dd9b992163b2abcc464a17075d83873;p=sdk diff --git a/crossplatform.mk b/crossplatform.mk index bfe31a0..442f64d 100644 --- a/crossplatform.mk +++ b/crossplatform.mk @@ -215,9 +215,11 @@ hs_crossloop = $(call hs_unsafe_crossloop,$(call fp_no_parent_dir,$(1)),$(2)) # PATH SEPARATOR STRING TOOLS ifdef WINDOWS_HOST -ifndef MSYSCON - WIN_PS_TOOLS := defined -endif + ifneq ($(TERM),cygwin) + ifndef MSYSCON + WIN_PS_TOOLS := defined + endif + endif endif slash_path = $(subst $(backslash),$(slash),$(1)) ifdef WIN_PS_TOOLS @@ -269,11 +271,15 @@ _CPP = $(if $(findstring $(space),$(CPP)),"$(CPP)",$(CPP)) _SYSROOT = $(if $(SYSROOT),$(space)--sysroot=$(SYSROOT),) +_MAKE = $(call fp_opt_quotes,$(MAKE)) + # SHELL COMMANDS ifdef WINDOWS_HOST -ifndef MSYSCON - WIN_SHELL_COMMANDS := defined -endif + ifneq ($(TERM),cygwin) + ifndef MSYSCON + WIN_SHELL_COMMANDS := defined + endif + endif endif ifneq ($(V),1) SILENT_IS_ON := defined