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.
This commit is contained in:
Peter Eisentraut 2009-01-05 09:54:13 +00:00
parent 26af72b46b
commit 46866e92bd
2 changed files with 5 additions and 3 deletions

View File

@ -1,5 +1,5 @@
# -*-makefile-*-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.249 2008/12/11 07:34:07 petere Exp $
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.250 2009/01/05 09:54:12 petere Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@ -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@

View File

@ -1,4 +1,4 @@
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.75 2008/12/01 11:37:37 meskes Exp $
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.76 2009/01/05 09:54:13 petere Exp $
subdir = src/interfaces/ecpg/test
top_builddir = ../../../..
@ -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)