diff options
| author | Tom Lane | 2023-09-27 01:06:21 +0000 |
|---|---|---|
| committer | Tom Lane | 2023-09-27 01:06:21 +0000 |
| commit | 0e0de20c88b978e13ad756a74462bf28cd1574bd (patch) | |
| tree | ebb278c25c086991607772dfedc6819d48f12855 | |
| parent | a4a8c0de2b8120b909510ebd33f28c29b038e685 (diff) | |
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
| -rw-r--r-- | src/Makefile.shlib | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 342496eecd0..e38333c27c2 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -123,13 +123,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) |