diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 3 | ||||
| -rw-r--r-- | src/Makefile.shlib | 10 | ||||
| -rw-r--r-- | src/makefiles/Makefile.aix | 1 | ||||
| -rw-r--r-- | src/makefiles/Makefile.freebsd | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.irix | 1 | ||||
| -rw-r--r-- | src/makefiles/Makefile.netbsd | 2 | ||||
| -rw-r--r-- | src/makefiles/Makefile.openbsd | 2 |
7 files changed, 5 insertions, 16 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 8a8094f1124..c935c4bf19b 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.221 2006/02/12 07:29:36 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.222 2006/04/19 16:32:08 tgl Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -222,7 +222,6 @@ LDFLAGS_SL = @LDFLAGS_SL@ LDREL = -r LDOUT = -o RANLIB = @RANLIB@ -LORDER = @LORDER@ X = @EXEEXT@ # Perl diff --git a/src/Makefile.shlib b/src/Makefile.shlib index 6db29541975..732338caa43 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.102 2006/01/05 03:01:34 momjian Exp $ +# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.103 2006/04/19 16:32:08 tgl Exp $ # #------------------------------------------------------------------------- @@ -266,17 +266,9 @@ all-static-lib: lib$(NAME).a all-shared-lib: $(shlib) -ifndef LORDER -MK_NO_LORDER := true -endif - ifndef haslibarule lib$(NAME).a: $(OBJS) -ifdef MK_NO_LORDER $(LINK.static) $@ $^ -else - $(LINK.static) $@ `$(LORDER) $^ | tsort` -endif $(RANLIB) $@ endif #haslibarule 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 |