Fix linker options for ODBC driver. See comment in
src/interfaces/odbc/GNUmakefile.
This commit is contained in:
parent
2a81896a2a
commit
9cf0a82fc3
9 changed files with 16 additions and 3 deletions
|
@ -2,7 +2,7 @@
|
||||||
#
|
#
|
||||||
# GNUMakefile for psqlodbc (Postgres ODBC driver)
|
# GNUMakefile for psqlodbc (Postgres ODBC driver)
|
||||||
#
|
#
|
||||||
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.7 2000/10/28 15:10:36 petere Exp $
|
# $Header: /cvsroot/pgsql/src/interfaces/odbc/Attic/GNUmakefile,v 1.8 2000/12/16 18:14:25 petere Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -30,6 +30,11 @@ all: all-lib
|
||||||
# Shared library stuff
|
# Shared library stuff
|
||||||
include $(top_srcdir)/src/Makefile.shlib
|
include $(top_srcdir)/src/Makefile.shlib
|
||||||
|
|
||||||
|
# Symbols must be resolved to the version in the shared library because
|
||||||
|
# the driver manager (e.g., iodbc) provides some symbols with the same
|
||||||
|
# names and we don't want those. (This issue is probably ELF specific.)
|
||||||
|
LINK.shared += $(shlib_symbolic)
|
||||||
|
|
||||||
odbc_headers = isql.h isqlext.h iodbc.h
|
odbc_headers = isql.h isqlext.h iodbc.h
|
||||||
odbc_includedir = $(includedir)/iodbc
|
odbc_includedir = $(includedir)/iodbc
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,7 @@ endif
|
||||||
ifeq ($(DLSUFFIX), .so)
|
ifeq ($(DLSUFFIX), .so)
|
||||||
CFLAGS_SL = -fpic
|
CFLAGS_SL = -fpic
|
||||||
export_dynamic = -export-dynamic
|
export_dynamic = -export-dynamic
|
||||||
|
shlib_symbolic = -Bsymbolic
|
||||||
else
|
else
|
||||||
CFLAGS_SL =
|
CFLAGS_SL =
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -3,6 +3,7 @@ AROPT = cr
|
||||||
ifdef ELF_SYSTEM
|
ifdef ELF_SYSTEM
|
||||||
export_dynamic = -export-dynamic
|
export_dynamic = -export-dynamic
|
||||||
rpath = -R$(libdir)
|
rpath = -R$(libdir)
|
||||||
|
shlib_symbolic = -Bsymbolic
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
MK_NO_LORDER= true
|
MK_NO_LORDER= true
|
||||||
AROPT = crs
|
AROPT = crs
|
||||||
rpath = -Wl,-rpath,$(libdir)
|
rpath = -Wl,-rpath,$(libdir)
|
||||||
|
shlib_symbolic = -Wl,-B,symbolic
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
# PIC is default
|
# PIC is default
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
AROPT = crs
|
AROPT = crs
|
||||||
export_dynamic = -export-dynamic
|
export_dynamic = -export-dynamic
|
||||||
rpath = -Wl,-rpath,$(libdir)
|
rpath = -Wl,-rpath,$(libdir)
|
||||||
|
shlib_symbolic = -Wl,-Bsymbolic
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
CFLAGS_SL = -fpic
|
CFLAGS_SL = -fpic
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@ AROPT = cr
|
||||||
ifdef ELF_SYSTEM
|
ifdef ELF_SYSTEM
|
||||||
export_dynamic = -Wl,-E
|
export_dynamic = -Wl,-E
|
||||||
rpath = -Wl,-R$(libdir)
|
rpath = -Wl,-R$(libdir)
|
||||||
|
shlib_symbolic = -Wl,-Bsymbolic
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
|
|
|
@ -3,6 +3,7 @@ AROPT = cr
|
||||||
ifdef ELF_SYSTEM
|
ifdef ELF_SYSTEM
|
||||||
export_dynamic = -Wl,-E
|
export_dynamic = -Wl,-E
|
||||||
rpath = -R$(libdir)
|
rpath = -R$(libdir)
|
||||||
|
shlib_symbolic = -Bsymbolic
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.5 2000/11/04 16:35:55 petere Exp $
|
# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.6 2000/12/16 18:14:25 petere Exp $
|
||||||
|
|
||||||
AROPT = crs
|
AROPT = crs
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ rpath = -Wl,-rpath,$(libdir)
|
||||||
else
|
else
|
||||||
rpath = -Wl,-R$(libdir)
|
rpath = -Wl,-R$(libdir)
|
||||||
endif
|
endif
|
||||||
|
shlib_symbolic = -Wl,-Bsymbolic
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
ifeq ($(GCC), yes)
|
ifeq ($(GCC), yes)
|
||||||
|
|
|
@ -3,6 +3,8 @@ export_dynamic = -Wl,-Bexport
|
||||||
ifeq ($(ld_R_works), yes)
|
ifeq ($(ld_R_works), yes)
|
||||||
rpath = -Wl,-R$(libdir)
|
rpath = -Wl,-R$(libdir)
|
||||||
endif
|
endif
|
||||||
|
shlib_symbolic = -Wl,-Bsymbolic
|
||||||
|
|
||||||
DLSUFFIX = .so
|
DLSUFFIX = .so
|
||||||
ifeq ($(GCC), yes)
|
ifeq ($(GCC), yes)
|
||||||
CFLAGS_SL = -fpic
|
CFLAGS_SL = -fpic
|
||||||
|
|
Loading…
Reference in a new issue