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 86db52fe5e1f5b0c36ea91eff2e30a5a5a387f1e..c293a34d1aa8403f776eefddc14b57d65a180824 100644 (file)
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -47,9 +47,8 @@
 # clean-lib             delete the static and shared libraries from the build dir
 # maintainer-clean-lib  delete .def files built for win32
 #
-# Since `all-lib' is the first rule in this file you probably want to
-# have the `all' target before including this file. In the most simple
-# case it would look like this:
+# Typically you would add `all-lib' to the `all' target so that `make all'
+# builds the libraries.  In the most simple case it would look like this:
 #
 #     all: all-lib
 #
@@ -128,7 +127,7 @@ ifeq ($(PORTNAME), darwin)
   else
     # loadable module
     DLSUFFIX           = .so
-    LINK.shared                = $(COMPILER) -bundle -multiply_defined suppress -Wl,-undefined,dynamic_lookup
+    LINK.shared                = $(COMPILER) -bundle -multiply_defined suppress
   endif
   BUILD.exports                = $(AWK) '/^[^\#]/ {printf "_%s\n",$$1}' $< >$@
   exports_file         = $(SHLIB_EXPORTS:%.txt=%.list)
@@ -194,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
@@ -237,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
@@ -323,7 +298,7 @@ endif
 endif # shlib_major
 
 # Where possible, restrict the symbols exported by the library to just the
-# official list, so as to avoid unintentional ABI changes.  On recent Darwin
+# official list, so as to avoid unintentional ABI changes.  On recent macOS
 # this also quiets multiply-defined-symbol warnings in programs that use
 # libpgport along with libpq.
 ifneq (,$(SHLIB_EXPORTS))
@@ -338,7 +313,16 @@ endif
 else # PORTNAME == aix
 
 # AIX case
-$(shlib) $(stlib): $(OBJS) | $(SHLIB_PREREQS)
+
+# There is no correct way to write a rule that generates two files.
+# Rules with two targets don't have that meaning, they are merely
+# shorthand for two otherwise separate rules.  To be safe for parallel
+# make, we must chain the dependencies like this.  The semicolon is
+# important, otherwise make will choose some built-in rule.
+
+$(stlib): $(shlib) ;
+
+$(shlib): $(OBJS) | $(SHLIB_PREREQS)
        rm -f $(stlib)
        $(LINK.static) $(stlib) $^
        $(RANLIB) $(stlib)