Give GCC on Irix a (theoretical) chance.

petere · petere · commit d8a11b29c10e · 2000-11-14T21:12:00.000Z
diff --git 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
@@ -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

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_version sgi$(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)`