summaryrefslogtreecommitdiff
path: root/src/makefiles
diff options
context:
space:
mode:
authorTom Lane2006-04-19 16:32:08 +0000
committerTom Lane2006-04-19 16:32:08 +0000
commit04ca4caa81b02cf10600b1b265b70c54a3aa7ea8 (patch)
tree8a0b68da1586be95d51c00e0575f90094eabf52b /src/makefiles
parent8f52496a05e83666bcf8b32c6e525cc6730fd78b (diff)
Remove use of lorder and tsort while building static libraries. There's
no evidence that any currently-supported platform needs this, and good reason to think that any platform that did need it couldn't use the static libraries anyway --- libpq, at least, has circular references. Removing the code shuts up tsort warnings about the circular references on some platforms.
Diffstat (limited to 'src/makefiles')
-rw-r--r--src/makefiles/Makefile.aix1
-rw-r--r--src/makefiles/Makefile.freebsd2
-rw-r--r--src/makefiles/Makefile.irix1
-rw-r--r--src/makefiles/Makefile.netbsd2
-rw-r--r--src/makefiles/Makefile.openbsd2
5 files changed, 3 insertions, 5 deletions
diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index a9c64d71c54..2a75a24aeac 100644
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -3,7 +3,6 @@
MAKE_EXPORTS= true
RANLIB= touch
-MK_NO_LORDER= true
AROPT = crs
DLSUFFIX = .so
diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index 131c8716d45..f6e57608064 100644
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -21,7 +21,7 @@ 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
diff --git a/src/makefiles/Makefile.irix b/src/makefiles/Makefile.irix
index 9a219aee5cc..2a23c5a8fd4 100644
--- a/src/makefiles/Makefile.irix
+++ b/src/makefiles/Makefile.irix
@@ -1,4 +1,3 @@
-MK_NO_LORDER= true
AROPT = crs
rpath = -Wl,-rpath,'$(rpathdir)'
diff --git a/src/makefiles/Makefile.netbsd b/src/makefiles/Makefile.netbsd
index 393511c48f3..db33ebff78e 100644
--- a/src/makefiles/Makefile.netbsd
+++ b/src/makefiles/Makefile.netbsd
@@ -23,7 +23,7 @@ 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
diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd
index a86c6e1619e..24e201836e9 100644
--- a/src/makefiles/Makefile.openbsd
+++ b/src/makefiles/Makefile.openbsd
@@ -21,7 +21,7 @@ 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