Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3aa021b

Browse files
committed
Stop using "-multiply_defined suppress" on macOS.
We started to use this linker switch in commit 9df3086 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
1 parent 5f567b3 commit 3aa021b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/Makefile.shlib

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,12 @@ ifeq ($(PORTNAME), darwin)
126126
ifneq ($(SO_MAJOR_VERSION), 0)
127127
version_link = -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
128128
endif
129-
LINK.shared = $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list) -multiply_defined suppress
129+
LINK.shared = $(COMPILER) -dynamiclib -install_name '$(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)' $(version_link) $(exported_symbols_list)
130130
shlib = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
131131
shlib_major = lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX)
132132
else
133133
# loadable module
134-
LINK.shared = $(COMPILER) -bundle -multiply_defined suppress
134+
LINK.shared = $(COMPILER) -bundle
135135
endif
136136
BUILD.exports = $(AWK) '/^[^\#]/ {printf "_%s\n",$$1}' $< >$@
137137
exports_file = $(SHLIB_EXPORTS:%.txt=%.list)

0 commit comments

Comments
 (0)