Give GCC on Irix a (theoretical) chance.

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index cb51484fae367f7f2b5580740460de331cd52478..6c543f61fea4d2c1705769c866bc06f159d11078 100644 (file)
--- 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 cc5aaf0dadb6b68a3f70227424fda155f0bf82b0..956c4217c483ab0f9cf88810b01e13a71cc1c82c 100644 (file)
--- 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