aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2023-09-26 21:06:21 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2023-09-26 21:06:21 -0400
commit78f17fb97a7e404d577778f048ec0d6da0ef2404 (patch)
tree75731cd7c536cd1d32a8cfa2eb8596f73973789c /src
parentc3f7e91a191bfce657ed27ea59781fb427c46c06 (diff)
downloadpostgresql-78f17fb97a7e404d577778f048ec0d6da0ef2404.tar.gz
postgresql-78f17fb97a7e404d577778f048ec0d6da0ef2404.zip
Stop using "-multiply_defined suppress" on macOS.
We started to use this linker switch in commit 9df308697 of 2004-07-13, which was in the OS X 10.3 era. Apparently it's been a no-op since around OS X 10.9. Apple's most recent toolchain version actively complains about it, so it's time to get rid of it. Discussion: https://postgr.es/m/467042.1695766998@sss.pgh.pa.us
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.shlib4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 551023c6fb0..b52d40ce982 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -122,13 +122,13 @@ ifeq ($(PORTNAME), darwin)
ifneq ($(SO_MAJOR_VERSION), 0)
version_link = -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
endif
- LINK.shared = $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list) -multiply_defined suppress
+ LINK.shared = $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list)
shlib = lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
shlib_major = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
else
# loadable module
DLSUFFIX = .so
- LINK.shared = $(COMPILER) -bundle -multiply_defined suppress
+ LINK.shared = $(COMPILER) -bundle
endif
BUILD.exports = $(AWK) '/^[^\#]/ {printf "_%s\n",$$1}' $< >$@
exports_file = $(SHLIB_EXPORTS:%.txt=%.list)