> > This patch corrects the use of rpath and export options when compiling
> > on postgres on Unixware with GCC built with gnu-as and gnu-ld. Remove leading spaces in conditional tests in patch and Makefile.aix. Nicolas Bazin
This commit is contained in:
parent
80f46fab63
commit
1f9010cc8d
@ -8,11 +8,11 @@ AROPT = crs
|
||||
|
||||
DLSUFFIX = .so
|
||||
ifneq ($(GCC), yes)
|
||||
ifeq ($(host_os), aix3.2.5)
|
||||
LDFLAGS_SL = -e _nostart
|
||||
else
|
||||
LDFLAGS_SL = -bnoentry
|
||||
endif
|
||||
ifeq ($(host_os), aix3.2.5)
|
||||
LDFLAGS_SL = -e _nostart
|
||||
else
|
||||
LDFLAGS_SL = -bnoentry
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
@ -28,11 +28,11 @@ $(POSTGRES_IMP):
|
||||
ifeq ($(host_os), aix3.2.5)
|
||||
$(MKLDEXPORT) postgres $(bindir) > $@
|
||||
else
|
||||
ifneq (,$(findstring aix4.1, $(host_os)))
|
||||
ifneq (,$(findstring aix4.1, $(host_os)))
|
||||
$(MKLDEXPORT) postgres $(bindir) > $@
|
||||
else
|
||||
else
|
||||
$(MKLDEXPORT) postgres . > $@
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
$(CC) -Wl,-bE:$(top_builddir)/src/backend/$@ -o postgres $(OBJS) $(LDFLAGS) $(LIBS)
|
||||
|
||||
|
@ -1,7 +1,16 @@
|
||||
AROPT = crs
|
||||
export_dynamic = -Wl,-Bexport
|
||||
ifeq ($(with_gnu_ld), yes)
|
||||
export_dynamic = -Wl,-E
|
||||
else
|
||||
export_dynamic = -Wl,-Bexport
|
||||
endif
|
||||
|
||||
ifeq ($(ld_R_works), yes)
|
||||
rpath = -Wl,-R$(libdir)
|
||||
ifeq ($(with_gnu_ld), yes)
|
||||
rpath = -Wl,-rpath,$(libdir)
|
||||
else
|
||||
rpath = -Wl,-R$(libdir)
|
||||
endif
|
||||
endif
|
||||
shlib_symbolic = -Wl,-Bsymbolic
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user