Make psql reject attempts to set special variables to invalid values.

[postgresql] / src / Makefile.shlib

diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 87c80c5d01bc2ece77f42909440e8e2ea3afcc77..c293a34d1aa8403f776eefddc14b57d65a180824 100644 (file)
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -193,7 +193,7 @@ ifeq ($(PORTNAME), hpux)
     # can't use the CC-syntax rpath pattern here, so instead:
     rpath =
     ifeq ($(enable_rpath), yes)
-      LINK.shared      += +b '$(rpathdir)'
+      LINK.shared      += +s +b '$(rpathdir)'
     endif
     # On HPUX platforms, gcc is usually configured to search for libraries
     # in /usr/local/lib, but ld won't do so.  Add an explicit -L switch so
@@ -236,30 +236,6 @@ ifeq ($(PORTNAME), solaris)
   endif
 endif
 
-ifeq ($(PORTNAME), sco)
-  ifeq ($(GCC), yes)
-    LINK.shared                = $(CC) -shared
-  else
-    LINK.shared                = $(CC) -G
-    endif
-  LINK.shared          += -Wl,-z,text
-  ifdef soname
-    LINK.shared                += -Wl,-h,$(soname)
-  endif
-endif
-
-ifeq ($(PORTNAME), unixware)
-  ifeq ($(GCC), yes)
-    LINK.shared                = $(CC) -shared
-  else
-    LINK.shared                = $(CC) -G
-  endif
-  LINK.shared          += -Wl,-z,text
-  ifdef soname
-    LINK.shared                += -Wl,-h,$(soname)
-  endif
-endif
-
 ifeq ($(PORTNAME), cygwin)
   LINK.shared          = $(CC) -shared
   ifdef SO_MAJOR_VERSION