diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-04-05 12:01:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-04-05 12:01:59 +0000 |
| commit | 1f9010cc8d4fa0445e75b05d512dc62fa1ce7d2d (patch) | |
| tree | 7e30cfa897e7ef82f6d242c2b7019d9ce246c3cb /src | |
| parent | 80f46fab634f8a307584a6291f7401e6f7e3494d (diff) | |
| download | postgresql-1f9010cc8d4fa0445e75b05d512dc62fa1ce7d2d.tar.gz postgresql-1f9010cc8d4fa0445e75b05d512dc62fa1ce7d2d.zip | |
> > 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/makefiles/Makefile.aix | 16 | ||||
| -rw-r--r-- | src/makefiles/Makefile.unixware | 13 |
2 files changed, 19 insertions, 10 deletions
diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix index 7c89e975bcf..0044a8f3ca2 100644 --- a/src/makefiles/Makefile.aix +++ b/src/makefiles/Makefile.aix @@ -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) diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware index 92888e18062..5722c46a177 100644 --- a/src/makefiles/Makefile.unixware +++ b/src/makefiles/Makefile.unixware @@ -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 |