mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-09-28 06:41:49 +02:00
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
This commit is contained in:
parent
c3f7e91a19
commit
78f17fb97a
@ -122,13 +122,13 @@ ifeq ($(PORTNAME), darwin)
|
|||||||
ifneq ($(SO_MAJOR_VERSION), 0)
|
ifneq ($(SO_MAJOR_VERSION), 0)
|
||||||
version_link = -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
|
version_link = -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
|
||||||
endif
|
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 = lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)
|
||||||
shlib_major = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
|
shlib_major = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
|
||||||
else
|
else
|
||||||
# loadable module
|
# loadable module
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
LINK.shared = $(COMPILER) -bundle -multiply_defined suppress
|
LINK.shared = $(COMPILER) -bundle
|
||||||
endif
|
endif
|
||||||
BUILD.exports = $(AWK) '/^[^\#]/ {printf "_%s\n",$$1}' $< >$@
|
BUILD.exports = $(AWK) '/^[^\#]/ {printf "_%s\n",$$1}' $< >$@
|
||||||
exports_file = $(SHLIB_EXPORTS:%.txt=%.list)
|
exports_file = $(SHLIB_EXPORTS:%.txt=%.list)
|
||||||
|
Loading…
Reference in New Issue
Block a user