Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 3ffd3d8

Browse files
bmomjianbmomjian
committed
Make LD -r as macros that can be changed for QNX.
1 parent cb0032c commit 3ffd3d8

File tree

56 files changed

+109
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+109
-109
lines changed

‎src/Makefile.shlib

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copyright (c) 1998, Regents of the University of California
77
#
88
# IDENTIFICATION
9-
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.16 1999/10/13 11:38:34 momjian Exp $
9+
# $Header: /cvsroot/pgsql/src/Makefile.shlib,v 1.17 1999/12/09 19:14:22 momjian Exp $
1010
#
1111
#-------------------------------------------------------------------------
1212

@@ -89,7 +89,7 @@ ifeq ($(PORTNAME), bsdi)
8989
install-shlib-dep := install-shlib
9090
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
9191
LD := shlicc
92-
LDFLAGS_SL += -O -r
92+
LDFLAGS_SL += -O $(LDREL)
9393
CFLAGS += $(CFLAGS_SL)
9494
endif
9595
endif

‎src/backend/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#
3535
#
3636
# IDENTIFICATION
37-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.39 1999/11/14 17:12:42 tgl Exp $
37+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.40 1999/12/09 19:14:23 momjian Exp $
3838
#
3939
#-------------------------------------------------------------------------
4040

@@ -109,7 +109,7 @@ catalog/global1.description catalog/local1_template1.description:
109109
# The postgres.o target is needed by the rule in Makefile.global that
110110
# creates the exports file when MAKE_EXPORTS = true.
111111
postgres.o: $(OBJS)
112-
$(CC) -r -o postgres.o $(OBJS) $(LDFLAGS)
112+
$(CC) $(LDREL) -o postgres.o $(OBJS) $(LDFLAGS)
113113

114114
############################################################################
115115
# The following targets are specified in make commands that appear in the

‎src/backend/access/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the access methods module
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.3 1997/06/11 01:11:30 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/Makefile,v 1.4 1999/12/09 19:14:24 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,7 @@ OBJS = common/SUBSYS.o gist/SUBSYS.o hash/SUBSYS.o heap/SUBSYS.o \
1818
all: submake SUBSYS.o
1919

2020
SUBSYS.o: $(OBJS)
21-
$(LD) -r -o SUBSYS.o $(OBJS)
21+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2222

2323
.PHONY: submake
2424
submake:

‎src/backend/access/common/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/common
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.13 1999/05/26 12:55:05 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/common/Makefile,v 1.14 1999/12/09 19:14:25 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -23,7 +23,7 @@ OBJS = heaptuple.o indextuple.o indexvalid.o printtup.o \
2323
all: SUBSYS.o
2424

2525
SUBSYS.o: $(OBJS)
26-
$(LD) -r -o SUBSYS.o $(OBJS)
26+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2727

2828
heaptuple.o heapvalid.o tupdesc.o: ../../fmgr.h
2929

‎src/backend/access/gist/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/gist
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.6 1998/04/06 00:20:49 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/gist/Makefile,v 1.7 1999/12/09 19:14:26 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,7 @@ OBJS = gist.o gistget.o gistscan.o giststrat.o
1818
all: SUBSYS.o
1919

2020
SUBSYS.o: $(OBJS)
21-
$(LD) -r -o SUBSYS.o $(OBJS)
21+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2222

2323
depend dep:
2424
$(CC) -MM $(CFLAGS) *.c >depend

‎src/backend/access/hash/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/hash
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.6 1998/04/06 00:20:58 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/hash/Makefile,v 1.7 1999/12/09 19:14:27 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -19,7 +19,7 @@ OBJS = hash.o hashfunc.o hashinsert.o hashovfl.o hashpage.o hashscan.o \
1919
all: SUBSYS.o
2020

2121
SUBSYS.o: $(OBJS)
22-
$(LD) -r -o SUBSYS.o $(OBJS)
22+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2323

2424
depend dep:
2525
$(CC) -MM $(CFLAGS) *.c >depend

‎src/backend/access/heap/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/heap
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.6 1998/04/06 00:21:09 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/heap/Makefile,v 1.7 1999/12/09 19:14:28 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,7 @@ OBJS = heapam.o hio.o stats.o
1818
all: SUBSYS.o
1919

2020
SUBSYS.o: $(OBJS)
21-
$(LD) -r -o SUBSYS.o $(OBJS)
21+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2222

2323
depend dep:
2424
$(CC) -MM $(CFLAGS) *.c >depend

‎src/backend/access/index/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/index
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.6 1998/04/06 00:21:24 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/index/Makefile,v 1.7 1999/12/09 19:14:29 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,7 @@ OBJS = genam.o indexam.o istrat.o
1818
all: SUBSYS.o
1919

2020
SUBSYS.o: $(OBJS)
21-
$(LD) -r -o SUBSYS.o $(OBJS)
21+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2222

2323
depend dep:
2424
$(CC) -MM $(CFLAGS) *.c >depend

‎src/backend/access/nbtree/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/nbtree
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.6 1998/04/06 00:21:34 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/nbtree/Makefile,v 1.7 1999/12/09 19:14:30 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -19,7 +19,7 @@ OBJS = nbtcompare.o nbtinsert.o nbtpage.o nbtree.o nbtscan.o nbtsearch.o \
1919
all: SUBSYS.o
2020

2121
SUBSYS.o: $(OBJS)
22-
$(LD) -r -o SUBSYS.o $(OBJS)
22+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2323

2424
depend dep:
2525
$(CC) -MM $(CFLAGS) *.c >depend

‎src/backend/access/rtree/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/rtree
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.6 1998/04/06 00:21:41 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/Makefile,v 1.7 1999/12/09 19:14:31 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,7 @@ OBJS = rtget.o rtproc.o rtree.o rtscan.o rtstrat.o
1818
all: SUBSYS.o
1919

2020
SUBSYS.o: $(OBJS)
21-
$(LD) -r -o SUBSYS.o $(OBJS)
21+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2222

2323
depend dep:
2424
$(CC) -MM $(CFLAGS) *.c >depend

‎src/backend/access/transam/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for access/transam
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.8 1999/10/24 20:42:27 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/access/transam/Makefile,v 1.9 1999/12/09 19:14:33 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,7 @@ OBJS = transam.o transsup.o varsup.o xact.o xid.o xlog.o rmgr.o
1818
all: SUBSYS.o
1919

2020
SUBSYS.o: $(OBJS)
21-
$(LD) -r -o SUBSYS.o $(OBJS)
21+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2222

2323
depend dep:
2424
$(CC) -MM $(CFLAGS) *.c >depend

‎src/backend/bootstrap/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the bootstrap module
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.15 1998/07/26 04:30:17 scrappy Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.16 1999/12/09 19:14:34 momjian Exp $
88
#
99
#
1010
# We must build bootparse.c and bootscanner.c with yacc and lex and sed,
@@ -37,7 +37,7 @@ OBJS= bootparse.o bootscanner.o bootstrap.o
3737
all: SUBSYS.o
3838

3939
SUBSYS.o: $(OBJS)
40-
$(LD) -r -o SUBSYS.o $(OBJS)
40+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
4141

4242
# bootstrap.o's dependency on bootstrap_tokens.h is computed by the
4343
# make depend, but we state it here explicitly anyway because

‎src/backend/catalog/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for catalog
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.18 1999/11/22 17:55:56 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/catalog/Makefile,v 1.19 1999/12/09 19:14:35 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -20,7 +20,7 @@ all: SUBSYS.o global1.bki.source local1_template1.bki.source \
2020
global1.description local1_template1.description
2121

2222
SUBSYS.o: $(OBJS)
23-
$(LD) -r -o SUBSYS.o $(OBJS)
23+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2424

2525
GENBKI= ./genbki.sh
2626

‎src/backend/commands/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for commands
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.20 1999/10/26 16:32:46 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/commands/Makefile,v 1.21 1999/12/09 19:14:36 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -25,7 +25,7 @@ OBJS = async.o creatinh.o command.o comment.o copy.o indexcmds.o define.o \
2525
all: SUBSYS.o
2626

2727
SUBSYS.o: $(OBJS)
28-
$(LD) -r -o SUBSYS.o $(OBJS)
28+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2929

3030
# The following declares a hard-coded dependency on parse.h since,
3131
# if compiled without make dep, comment.c would get compiled before

‎src/backend/executor/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for executor
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.9 1999/11/23 20:06:49 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/executor/Makefile,v 1.10 1999/12/09 19:14:38 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -24,7 +24,7 @@ OBJS = execAmi.o execFlatten.o execJunk.o execMain.o \
2424
all: SUBSYS.o
2525

2626
SUBSYS.o: $(OBJS)
27-
$(LD) -r -o SUBSYS.o $(OBJS)
27+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2828

2929
depend dep:
3030
$(CC) -MM $(CFLAGS) *.c >depend

‎src/backend/lib/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for lib (miscellaneous stuff)
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.10 1998/03/30 16:46:24 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/lib/Makefile,v 1.11 1999/12/09 19:14:39 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -20,7 +20,7 @@ OBJS = bit.o fstack.o hasht.o lispsort.o stringinfo.o dllist.o
2020
all: SUBSYS.o
2121

2222
SUBSYS.o: $(OBJS)
23-
$(LD) -r -o SUBSYS.o $(OBJS)
23+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2424

2525
depend dep:
2626
$(CC) -MM $(INCLUDE_OPT) *.c >depend

‎src/backend/libpq/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for libpq subsystem (backend half of libpq interface)
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.14 1999/04/25 03:27:15 tgl Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.15 1999/12/09 19:14:40 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -31,7 +31,7 @@ OBJS = be-dumpdata.o be-fsstubs.o be-pqexec.o portal.o portalbuf.o \
3131
all: SUBSYS.o
3232

3333
SUBSYS.o: $(OBJS)
34-
$(LD) -r -o SUBSYS.o $(OBJS)
34+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
3535

3636
be-dumpdata.o be-pqexec.o: ../fmgr.h
3737

‎src/backend/main/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for main
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.5 1998/04/06 00:22:51 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/main/Makefile,v 1.6 1999/12/09 19:14:41 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,7 @@ OBJS = main.o
1818
all: SUBSYS.o
1919

2020
SUBSYS.o: $(OBJS)
21-
$(LD) -r -o SUBSYS.o $(OBJS)
21+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2222

2323
depend dep:
2424
$(CC) -MM $(CFLAGS) *.c >depend

‎src/backend/nodes/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for nodes
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.8 1999/02/23 07:24:08 thomas Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/nodes/Makefile,v 1.9 1999/12/09 19:14:42 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -20,7 +20,7 @@ OBJS = nodeFuncs.o nodes.o list.o \
2020
all: SUBSYS.o
2121

2222
SUBSYS.o: $(OBJS)
23-
$(LD) -r -o SUBSYS.o $(OBJS)
23+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2424

2525
outfuncs.o: ../parse.h
2626

‎src/backend/optimizer/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for optimizer
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.5 1998/04/06 00:23:04 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/optimizer/Makefile,v 1.6 1999/12/09 19:14:43 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -18,7 +18,7 @@ OBJS = path/SUBSYS.o plan/SUBSYS.o prep/SUBSYS.o util/SUBSYS.o geqo/SUBSYS.o
1818
DIRS = path plan prep util geqo
1919

2020
SUBSYS.o: $(OBJS)
21-
$(LD) -r -o SUBSYS.o $(OBJS)
21+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2222

2323
.PHONY: submake clean dep depend
2424
submake:

‎src/backend/optimizer/geqo/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# Copyright (c) 1994, Regents of the University of California
77
#
8-
# $Id: Makefile,v 1.11 1999/02/15 03:22:00 momjian Exp $
8+
# $Id: Makefile,v 1.12 1999/12/09 19:14:44 momjian Exp $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -28,7 +28,7 @@ OBJS = geqo_copy.o geqo_eval.o geqo_main.o geqo_misc.o \
2828
all: SUBSYS.o
2929

3030
SUBSYS.o: $(OBJS)
31-
$(LD) -r -o SUBSYS.o $(OBJS)
31+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
3232

3333
depend dep:
3434
$(CC) -MM $(CFLAGS) *.c >depend

‎src/backend/optimizer/path/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for optimizer/path
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.10 1999/11/23 20:06:54 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/optimizer/path/Makefile,v 1.11 1999/12/09 19:14:45 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -20,7 +20,7 @@ OBJS = allpaths.o clausesel.o costsize.o indxpath.o \
2020
all: SUBSYS.o
2121

2222
SUBSYS.o: $(OBJS)
23-
$(LD) -r -o SUBSYS.o $(OBJS)
23+
$(LD) $(LDREL) -o SUBSYS.o $(OBJS)
2424

2525
depend dep:
2626
$(CC) -MM $(CFLAGS) *.c >depend

0 commit comments

Comments
 (0)