From: Peter Eisentraut <peter_e@gmx.net>
Date: Mon, 5 Jan 2009 09:54:13 +0000 (+0000)
Subject: Fix for cross-compilation between mingw32 and something else.  The choice
X-Git-Tag: recoveryinfrav9~135
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=312aff3a905e66305daa856dba129fa556e42c8e;p=users%2Fsimon%2Fpostgres.git

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 3202263daa..37e0594b23 100644
--- 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 f5744d5839..7b32437f5f 100644
--- 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)