Fix for cross-compilation between mingw32 and something else. The choice

of pwd vs. pwd -W is correctly a function of the build system, not the
host system.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 3202263daaf8083550b90defe44ce6fb61aae5ad..37e0594b23c1982848d552d637354af77209d554 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -322,6 +322,8 @@ WANTED_LANGUAGES = @WANTED_LANGUAGES@
 # Name of the "template"
 PORTNAME= @PORTNAME@
 
+build_os = @build_os@
+
 host_tuple = @host@
 host_os = @host_os@
 host_cpu = @host_cpu@

diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index f5744d58396569f03795fedba8b153e170cf920b..7b32437f5f69fd6997f55448429d9ff7187b962f 100644 (file)
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -16,7 +16,7 @@ ifdef NO_LOCALE
 NOLOCALE += --no-locale
 endif
 
-ifneq ($(PORTNAME),win32)
+ifneq ($(build_os),mingw32)
 abs_builddir := $(shell pwd)
 else
 abs_builddir := $(shell pwd -W)