diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-11-14 21:12:00 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-11-14 21:12:00 +0000 |
| commit | d8a11b29c10ea7c32ab38185346fd3d31e39bc7d (patch) | |
| tree | dcce0e9fcea11df95d6c7c089e396eed7adaae08 | |
| parent | 21e1e6643c3f79c31bd3db3f4e396e6cd646ab32 (diff) | |
| download | postgresql-d8a11b29c10ea7c32ab38185346fd3d31e39bc7d.tar.gz postgresql-d8a11b29c10ea7c32ab38185346fd3d31e39bc7d.zip | |
Give GCC on Irix a (theoretical) chance.
| -rw-r--r-- | src/Makefile.shlib | 4 | ||||
| -rw-r--r-- | src/makefiles/Makefile.irix5 | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index cb51484fae3..6c543f61fea 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.34 2000/11/09 04:17:53 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.35 2000/11/14 21:11:59 petere Exp $ # #------------------------------------------------------------------------- @@ -155,7 +155,7 @@ endif ifeq ($(PORTNAME), irix5) shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION) - LINK.shared = $(COMPILER) -shared -set_version sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) + LINK.shared = $(COMPILER) -shared -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION) endif ifeq ($(PORTNAME), linux) diff --git a/src/makefiles/Makefile.irix5 b/src/makefiles/Makefile.irix5 index cc5aaf0dadb..956c4217c48 100644 --- a/src/makefiles/Makefile.irix5 +++ b/src/makefiles/Makefile.irix5 @@ -1,14 +1,17 @@ -# RANLIB is not used on IRIX 5 -RANLIB= touch MK_NO_LORDER= true AROPT = crs rpath = -Wl,-rpath,$(libdir) DLSUFFIX = .so +# PIC is default CFLAGS_SL = %.so: %.o $(LD) -G -Bdynamic -shared -o $@ $< override CPPFLAGS += -U_NO_XOPEN4 -override CFLAGS += -woff 1164,1171,1185,1195,1552 -Wl,-woff,15 -Wl,-woff,84 + +ifneq ($(GCC), yes) +CFLAGS += -woff 1164,1171,1185,1195,1552 +endif +LDFLAGS += -Wl,-woff,15 -Wl,-woff,84 |