diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-01-05 09:54:13 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-01-05 09:54:13 +0000 |
| commit | 46866e92bd89f1e81a2dbe45a8c1997f23f452fa (patch) | |
| tree | 650c2631e4ed923872e24447a36881ba61398cda /src | |
| parent | 26af72b46b8fb4b828224f5d5f67a99f16ebdb38 (diff) | |
| download | postgresql-46866e92bd89f1e81a2dbe45a8c1997f23f452fa.tar.gz postgresql-46866e92bd89f1e81a2dbe45a8c1997f23f452fa.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index a1fc846ac86..749eae5a937 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -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@ diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile index 8ba244941a9..be017e5c9ac 100644 --- a/src/interfaces/ecpg/test/Makefile +++ b/src/interfaces/ecpg/test/Makefile @@ -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) |