diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-10-28 17:32:22 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-10-28 17:32:22 +0000 |
| commit | a7de22d8d5bab7c4d98ac33c474ebbad700819c5 (patch) | |
| tree | ce3e2f33e7e65607889ba4c45a987e7e1f3e7b14 | |
| parent | 1986ca5ce5031b27a0e35ea0ab7d7c2f479e2afc (diff) | |
| download | postgresql-a7de22d8d5bab7c4d98ac33c474ebbad700819c5.tar.gz postgresql-a7de22d8d5bab7c4d98ac33c474ebbad700819c5.zip | |
Clean up AIX build to avoid 'duplicate symbol' warnings, by moving use
of postgres.imp file into BE_DLLLIBS macro. This makes the AIX build
work more like the Windows and Darwin builds, which have similar requirements
to mention a backend library when linking shared libraries that will be
dynamically loaded into the backend.
| -rw-r--r-- | src/Makefile.shlib | 4 | ||||
| -rw-r--r-- | src/makefiles/Makefile.aix | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 132d465a858..21e338e8156 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -6,7 +6,7 @@ # Copyright (c) 1998, Regents of the University of California # # IDENTIFICATION -# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.97 2005/08/08 03:35:13 tgl Exp $ +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.98 2005/10/28 17:32:22 tgl Exp $ # #------------------------------------------------------------------------- @@ -309,7 +309,7 @@ else # PORTNAME == aix # AIX case $(shlib): lib$(NAME).a $(MKLDEXPORT) lib$(NAME).a > lib$(NAME)$(EXPSUFF) - $(COMPILER) $(LDFLAGS_SL) -o $@ $< $(LDFLAGS) $(SHLIB_LINK) -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP) -Wl,-bE:lib$(NAME)$(EXPSUFF) + $(COMPILER) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $< -Wl,-bE:lib$(NAME)$(EXPSUFF) $(SHLIB_LINK) endif # PORTNAME == aix diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix index 99099272eb2..3b21a74c92b 100644 --- a/src/makefiles/Makefile.aix +++ b/src/makefiles/Makefile.aix @@ -21,13 +21,18 @@ IMPSUFF= .imp POSTGRES_IMP= postgres$(IMPSUFF) +ifdef PGXS +BE_DLLLIBS= -Wl,-bI:$(DESTDIR)$(bindir)/postgres/$(POSTGRES_IMP) +else +BE_DLLLIBS= -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP) +endif + MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh %$(EXPSUFF): %.o $(MKLDEXPORT) $*.o > $*$(EXPSUFF) %$(DLSUFFIX): %.o %$(EXPSUFF) - @echo Making shared library $@ from $*.o, $*$(EXPSUFF) and postgres.imp - $(CC) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP) -Wl,-bE:$*$(EXPSUFF) $(SHLIB_LINK) + $(CC) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*$(EXPSUFF) $(SHLIB_LINK) sqlmansect = 7 |