Add '-Wl,' prefix to linker switches consistently. Remove shlib_symbolic
macros, which aren't used anywhere and haven't been for some time.
This commit is contained in:
parent
96b42de9a8
commit
71d21577de
@ -15,8 +15,7 @@ endif
|
|||||||
ifeq ($(DLSUFFIX), .so)
|
ifeq ($(DLSUFFIX), .so)
|
||||||
CFLAGS_SL = -fpic
|
CFLAGS_SL = -fpic
|
||||||
rpath = -Wl,-rpath,$(rpathdir)
|
rpath = -Wl,-rpath,$(rpathdir)
|
||||||
export_dynamic = -export-dynamic
|
export_dynamic = -Wl,-export-dynamic
|
||||||
shlib_symbolic = -Wl,-Bsymbolic
|
|
||||||
else
|
else
|
||||||
CFLAGS_SL =
|
CFLAGS_SL =
|
||||||
endif
|
endif
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
AROPT = cr
|
AROPT = cr
|
||||||
|
|
||||||
ifdef ELF_SYSTEM
|
ifdef ELF_SYSTEM
|
||||||
export_dynamic = -export-dynamic
|
export_dynamic = -Wl,-export-dynamic
|
||||||
rpath = -R$(rpathdir)
|
rpath = -Wl,-R$(rpathdir)
|
||||||
shlib_symbolic = -Wl,-Bsymbolic -lc
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
|
@ -33,7 +33,6 @@ endif
|
|||||||
|
|
||||||
# set up appropriate options for shared library builds
|
# set up appropriate options for shared library builds
|
||||||
export_dynamic = -Wl,-E
|
export_dynamic = -Wl,-E
|
||||||
shlib_symbolic = -Bsymbolic
|
|
||||||
|
|
||||||
INSTALL_SHLIB_OPTS = -m 555
|
INSTALL_SHLIB_OPTS = -m 555
|
||||||
|
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
MK_NO_LORDER= true
|
MK_NO_LORDER= true
|
||||||
AROPT = crs
|
AROPT = crs
|
||||||
rpath = -Wl,-rpath,$(rpathdir)
|
rpath = -Wl,-rpath,$(rpathdir)
|
||||||
shlib_symbolic = -Wl,-B,symbolic
|
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
# PIC is default
|
# PIC is default
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
AROPT = crs
|
AROPT = crs
|
||||||
export_dynamic = -Wl,-E
|
export_dynamic = -Wl,-E
|
||||||
rpath = -Wl,-rpath,$(rpathdir)
|
rpath = -Wl,-rpath,$(rpathdir)
|
||||||
shlib_symbolic = -Wl,-Bsymbolic
|
|
||||||
allow_nonpic_in_shlib = yes
|
allow_nonpic_in_shlib = yes
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
|
|
||||||
|
@ -3,9 +3,8 @@ AROPT = cr
|
|||||||
ifdef ELF_SYSTEM
|
ifdef ELF_SYSTEM
|
||||||
export_dynamic = -Wl,-E
|
export_dynamic = -Wl,-E
|
||||||
rpath = -Wl,-R$(rpathdir)
|
rpath = -Wl,-R$(rpathdir)
|
||||||
shlib_symbolic = -Wl,-Bsymbolic -lc
|
|
||||||
else
|
else
|
||||||
rpath = -R$(rpathdir)
|
rpath = -Wl,-R$(rpathdir)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
|
@ -2,8 +2,7 @@ AROPT = cr
|
|||||||
|
|
||||||
ifdef ELF_SYSTEM
|
ifdef ELF_SYSTEM
|
||||||
export_dynamic = -Wl,-E
|
export_dynamic = -Wl,-E
|
||||||
rpath = -R$(rpathdir)
|
rpath = -Wl,-R$(rpathdir)
|
||||||
shlib_symbolic = -Wl,-Bsymbolic
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
AROPT = crs
|
AROPT = crs
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
CFLAGS_SL =
|
CFLAGS_SL =
|
||||||
rpath = -rpath $(rpathdir)
|
rpath = -Wl,-rpath -Wl,$(rpathdir)
|
||||||
|
|
||||||
%.so: %.o
|
%.so: %.o
|
||||||
$(LD) -shared -expect_unresolved '*' -o $@ $<
|
$(LD) -shared -expect_unresolved '*' -o $@ $<
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
AROPT = cr
|
AROPT = cr
|
||||||
export_dynamic = -Wl,-Bexport
|
export_dynamic = -Wl,-Bexport
|
||||||
shlib_symbolic = -Wl,-Bsymbolic
|
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
ifeq ($(GCC), yes)
|
ifeq ($(GCC), yes)
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.11 2004/11/19 00:41:39 tgl Exp $
|
# $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.12 2004/12/21 18:47:42 tgl Exp $
|
||||||
|
|
||||||
AROPT = crs
|
AROPT = crs
|
||||||
|
|
||||||
@ -6,9 +6,8 @@ ifeq ($(with_gnu_ld), yes)
|
|||||||
export_dynamic = -Wl,-E
|
export_dynamic = -Wl,-E
|
||||||
rpath = -Wl,-rpath,$(rpathdir)
|
rpath = -Wl,-rpath,$(rpathdir)
|
||||||
else
|
else
|
||||||
rpath = -R$(rpathdir)
|
rpath = -Wl,-R$(rpathdir)
|
||||||
endif
|
endif
|
||||||
shlib_symbolic = -Wl,-Bsymbolic
|
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
ifeq ($(GCC), yes)
|
ifeq ($(GCC), yes)
|
||||||
|
@ -12,7 +12,6 @@ else
|
|||||||
rpath = -Wl,-R$(rpathdir)
|
rpath = -Wl,-R$(rpathdir)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
shlib_symbolic = -Wl,-Bsymbolic
|
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
ifeq ($(GCC), yes)
|
ifeq ($(GCC), yes)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user