Partial fix for contrib vpath breakage.

[postgresql] / src / makefiles / Makefile.freebsd

diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index 91a45a63632074476e66873d3b5241bce35d4853..201dcd6f4cd7703773fb685b4166b70ba7b9afd1 100644 (file)
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -1,22 +1,30 @@
 AROPT = cr
 
 ifdef ELF_SYSTEM
-export_dynamic = -export-dynamic
-rpath = -R$(libdir)
+export_dynamic = -Wl,-export-dynamic
+rpath = -Wl,-R'$(rpathdir)'
 endif
 
 DLSUFFIX = .so
-CFLAGS_SL = -fpic -DPIC
+
+CFLAGS_SL = -fPIC -DPIC
+
+ifeq ($(findstring i386,$(host_cpu)), i386)
+allow_nonpic_in_shlib = yes
+endif
+
 
 %.so: %.o
 ifdef ELF_SYSTEM
-       $(LD) -x -shared -o $@ $<
+       $(CC) $(CFLAGS) -shared -o $@ $<
 else
        $(LD) $(LDREL) $(LDOUT) $<.obj -x $<
        @echo building shared object $@
        @rm -f $@.pic
-       @${AR} cq $@.pic `lorder $<.obj | tsort`
+       @${AR} cq $@.pic $<.obj
        ${RANLIB} $@.pic
        @rm -f $@
        $(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic
 endif
+
+sqlmansect = 7