Commitd8a11b2

committed

Give GCC on Irix a (theoretical) chance.

1 parent21e1e66 commitd8a11b2Copy full SHA for d8a11b2

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`# Copyright (c) 1998, Regents of the University of California`
`7`	`7`	`#`
`8`	`8`	`# IDENTIFICATION`
`9`		`-# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.34 2000/11/09 04:17:53 momjian Exp $`
	`9`	`+# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.35 2000/11/14 21:11:59 petere Exp $`
`10`	`10`	`#`
`11`	`11`	`#-------------------------------------------------------------------------`
`12`	`12`
`@@ -155,7 +155,7 @@ endif`
`155`	`155`
`156`	`156`	`ifeq ($(PORTNAME), irix5)`
`157`	`157`	`shlib:= lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)`
`158`		`- LINK.shared= $(COMPILER) -shared -set_versionsgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
	`158`	`+ LINK.shared= $(COMPILER) -shared -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)`
`159`	`159`	`endif`
`160`	`160`
`161`	`161`	`ifeq ($(PORTNAME), linux)`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,17 @@`
`1`		`-# RANLIB is not used on IRIX 5`
`2`		`-RANLIB= touch`
`3`	`1`	`MK_NO_LORDER= true`
`4`	`2`	`AROPT = crs`
`5`	`3`	`rpath = -Wl,-rpath,$(libdir)`
`6`	`4`
`7`	`5`	`DLSUFFIX = .so`
	`6`	`+# PIC is default`
`8`	`7`	`CFLAGS_SL =`
`9`	`8`
`10`	`9`	`%.so: %.o`
`11`	`10`	`$(LD) -G -Bdynamic -shared -o $@ $<`
`12`	`11`
`13`	`12`	`override CPPFLAGS += -U_NO_XOPEN4`
`14`		`-override CFLAGS += -woff 1164,1171,1185,1195,1552 -Wl,-woff,15 -Wl,-woff,84`
	`13`	`+`
	`14`	`+ifneq ($(GCC), yes)`
	`15`	`+CFLAGS += -woff 1164,1171,1185,1195,1552`
	`16`	`+endif`
	`17`	`+LDFLAGS += -Wl,-woff,15 -Wl,-woff,84`

Comments

(0)