diff options
author | Peter Eisentraut | 2008-09-01 08:50:10 +0000 |
---|---|---|
committer | Peter Eisentraut | 2008-09-01 08:50:10 +0000 |
commit | d01243fe9746f47fc47342b61a7580efe806cc15 (patch) | |
tree | 608468089278974b4618f06df556f661f6aa59be | |
parent | 9a0332e13e05f9ba679121bf3ca15e65a4cf07d6 (diff) |
Synchronize the shared object build rules in Makefile.port with Makefile.shlib
somewhat by adding CFLAGS where the compiler is used and Makefile.shlib
already used CFLAGS.
-rw-r--r-- | src/Makefile.shlib | 5 | ||||
-rw-r--r-- | src/makefiles/Makefile.aix | 2 | ||||
-rw-r--r-- | src/makefiles/Makefile.bsdi | 2 | ||||
-rw-r--r-- | src/makefiles/Makefile.freebsd | 2 | ||||
-rw-r--r-- | src/makefiles/Makefile.irix | 2 | ||||
-rw-r--r-- | src/makefiles/Makefile.linux | 2 | ||||
-rw-r--r-- | src/makefiles/Makefile.netbsd | 2 | ||||
-rw-r--r-- | src/makefiles/Makefile.openbsd | 2 | ||||
-rw-r--r-- | src/makefiles/Makefile.solaris | 6 |
9 files changed, 14 insertions, 11 deletions
diff --git a/src/Makefile.shlib b/src/Makefile.shlib index cafb13586d..2c1f961deb 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -256,10 +256,9 @@ endif ifeq ($(PORTNAME), solaris) ifeq ($(GCC), yes) - LINK.shared = $(COMPILER) -shared # $(COMPILER) needed for -m64 + LINK.shared = $(COMPILER) -shared else -# CFLAGS added for X86_64 - LINK.shared = $(CC) -G $(CFLAGS) + LINK.shared = $(COMPILER) -G endif ifdef soname ifeq ($(with_gnu_ld), yes) diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix index ea825a7ca6..35d45237f5 100644 --- a/src/makefiles/Makefile.aix +++ b/src/makefiles/Makefile.aix @@ -38,6 +38,6 @@ MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh $(MKLDEXPORT) $^ >$@ %$(DLSUFFIX): %.o %.exp - $(CC) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(SHLIB_LINK) + $(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(SHLIB_LINK) sqlmansect = 7 diff --git a/src/makefiles/Makefile.bsdi b/src/makefiles/Makefile.bsdi index 47b1274055..0ce0704123 100644 --- a/src/makefiles/Makefile.bsdi +++ b/src/makefiles/Makefile.bsdi @@ -21,6 +21,6 @@ CFLAGS_SL = endif %.so: %.o - $(CC) -shared -o $@ $< + $(CC) $(CFLAGS) -shared -o $@ $< sqlmansect = 7 diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd index f6e5760806..201dcd6f4c 100644 --- a/src/makefiles/Makefile.freebsd +++ b/src/makefiles/Makefile.freebsd @@ -16,7 +16,7 @@ endif %.so: %.o ifdef ELF_SYSTEM - $(LD) -x -shared -o $@ $< + $(CC) $(CFLAGS) -shared -o $@ $< else $(LD) $(LDREL) $(LDOUT) $<.obj -x $< @echo building shared object $@ diff --git a/src/makefiles/Makefile.irix b/src/makefiles/Makefile.irix index 2a23c5a8fd..145653860e 100644 --- a/src/makefiles/Makefile.irix +++ b/src/makefiles/Makefile.irix @@ -6,7 +6,7 @@ DLSUFFIX = .so CFLAGS_SL = %.so: %.o - $(LD) -G -Bdynamic -shared -o $@ $< + $(CC) $(CFLAGS) -shared -o $@ $< override CPPFLAGS += -U_NO_XOPEN4 diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux index 8766d18f61..0fadd27310 100644 --- a/src/makefiles/Makefile.linux +++ b/src/makefiles/Makefile.linux @@ -11,6 +11,6 @@ CFLAGS_SL = -fpic endif %.so: %.o - $(CC) -shared -o $@ $< + $(CC) $(CFLAGS) -shared -o $@ $< sqlmansect = 7 diff --git a/src/makefiles/Makefile.netbsd b/src/makefiles/Makefile.netbsd index db33ebff78..820e33074f 100644 --- a/src/makefiles/Makefile.netbsd +++ b/src/makefiles/Makefile.netbsd @@ -18,7 +18,7 @@ endif %.so: %.o ifdef ELF_SYSTEM - $(LD) -x -Bshareable -o $@ $< + $(CC) $(CFLAGS) -shared -o $@ $< else $(LD) $(LDREL) $(LDOUT) $<.obj -x $< @echo building shared object $@ diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd index 24e201836e..7c6765c657 100644 --- a/src/makefiles/Makefile.openbsd +++ b/src/makefiles/Makefile.openbsd @@ -16,7 +16,7 @@ endif %.so: %.o ifdef ELF_SYSTEM - $(CC) -shared -o $@ $< + $(CC) $(CFLAGS) -shared -o $@ $< else $(LD) $(LDREL) $(LDOUT) $<.obj -x $< @echo building shared object $@ diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris index dac307c2e2..9f2bf1348c 100644 --- a/src/makefiles/Makefile.solaris +++ b/src/makefiles/Makefile.solaris @@ -17,6 +17,10 @@ CFLAGS_SL = -KPIC endif %.so: %.o - $(LD) -G -Bdynamic -o $@ $< +ifeq ($(GCC), yes) + $(CC) $(CFLAGS) -shared -o $@ $< +else + $(CC) $(CFLAGS) -G -o $@ $< +endif sqlmansect = 5sql |