Commit46866e9

committed

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 thehost system.

1 parent26af72b commit46866e9Copy full SHA for 46866e9

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# --makefile--`
`2`		`-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.249 2008/12/11 07:34:07 petere Exp $`
	`2`	`+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.250 2009/01/05 09:54:12 petere Exp $`
`3`	`3`
`4`	`4`	`#------------------------------------------------------------------------------`
`5`	`5`	`# All PostgreSQL makefiles include this file and use the variables it sets,`
`@@ -322,6 +322,8 @@ WANTED_LANGUAGES = @WANTED_LANGUAGES@`
`322`	`322`	`# Name of the "template"`
`323`	`323`	`PORTNAME= @PORTNAME@`
`324`	`324`
	`325`	`+build_os = @build_os@`
	`326`	`+`
`325`	`327`	`host_tuple = @host@`
`326`	`328`	`host_os = @host_os@`
`327`	`329`	`host_cpu = @host_cpu@`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.75 2008/12/01 11:37:37 meskes Exp $`
	`1`	`+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.76 2009/01/05 09:54:13 petere Exp $`
`2`	`2`
`3`	`3`	`subdir = src/interfaces/ecpg/test`
`4`	`4`	`top_builddir = ../../../..`
`@@ -16,7 +16,7 @@ ifdef NO_LOCALE`
`16`	`16`	`NOLOCALE += --no-locale`
`17`	`17`	`endif`
`18`	`18`
`19`		`-ifneq ($(PORTNAME),win32)`
	`19`	`+ifneq ($(build_os),mingw32)`
`20`	`20`	`abs_builddir :=$(shell pwd)`
`21`	`21`	`else`
`22`	`22`	`abs_builddir :=$(shell pwd -W)`

Comments

(0)