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

Commit a3578c1

Browse files
committed
Separate -Wl,-E or equivalent into separate make variable, since it's only
necessary for the postgres/postmaster link, not every link.
1 parent 450b621 commit a3578c1

File tree

12 files changed

+16
-14
lines changed

12 files changed

+16
-14
lines changed

src/backend/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.65 2000/09/17 13:02:30 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.66 2000/10/07 18:43:22 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -37,7 +37,7 @@ all: postgres $(POSTGRES_IMP)
3737
ifneq ($(PORTNAME), win)
3838

3939
postgres: $(OBJS)
40-
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
40+
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(export_dynamic)
4141

4242
else # win
4343

@@ -192,7 +192,7 @@ maintainer-clean: distclean
192192
# are up to date. It saves the time of doing all the submakes.
193193
.PHONY: quick
194194
quick: $(OBJS)
195-
$(CC) -o postgres $(OBJS) $(LDFLAGS)
195+
$(CC) -o postgres $(OBJS) $(LDFLAGS) $(export_dynamic)
196196

197197
depend dep: $(top_srcdir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
198198
for i in $(DIRS); do $(MAKE) -C $$i $@; done

src/makefiles/Makefile.beos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MK_NO_LORDER=true
22
ifdef ELF_SYSTEM
3-
LDFLAGS += -Wl,-E
3+
export_dynamic = -Wl,-E
44
CPPFLAGS+= -I$(top_srcdir)/src/backend/port/beos
55
endif
66
%.so: %.o

src/makefiles/Makefile.bsdi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# if we defined .so in template/bsdi_4.0
33

44
ifeq ($(DLSUFFIX), .so)
5-
LDFLAGS+= -export-dynamic
5+
export_dynamic = -export-dynamic
66
endif
77

88
%.so: %.o

src/makefiles/Makefile.freebsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ifdef ELF_SYSTEM
2-
LDFLAGS+= -export-dynamic
2+
export_dynamic = -export-dynamic
33
endif
44

55
%.so: %.o

src/makefiles/Makefile.hpux

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ endif
2323
# so that the executables don't need SHLIB_PATH to be set, specify -z
2424
# to catch null pointer dereferences, and specify -E to make all symbols
2525
# visible to dynamically linked shared libraries.
26-
LDFLAGS+= -Wl,+b -Wl,$(libdir) -Wl,-z -Wl,-E
26+
LDFLAGS+= -Wl,+b -Wl,$(libdir) -Wl,-z
27+
export_dynamic = -Wl,-E
2728

2829
# Rule for building shared libs (currently used only for regression test
2930
# shlib ... should go away, since this is not really enough knowledge)

src/makefiles/Makefile.linux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LDFLAGS+= -export-dynamic
1+
export_dynamic = -export-dynamic
22
MK_NO_LORDER= true
33

44
%.so: %.o

src/makefiles/Makefile.netbsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ifdef ELF_SYSTEM
2-
LDFLAGS += -Wl,-E
2+
export_dynamic = -Wl,-E
33
endif
44
%.so: %.o
55
ifdef ELF_SYSTEM

src/makefiles/Makefile.openbsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ifdef ELF_SYSTEM
2-
LDFLAGS += -Wl,-E
2+
export_dynamic = -Wl,-E
33
endif
44
%.so: %.o
55
ifdef ELF_SYSTEM

src/makefiles/Makefile.sco

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CFLAGS += -dy
2-
LDFLAGS += -W l,-Bexport
2+
export_dynamic = -W l,-Bexport
33

44
%.so: %.o
55
$(LD) -G -Bdynamic -o $@ $<

src/makefiles/Makefile.univel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
LDFLAGS+= -lc89 -Wl,-Bexport
1+
LDFLAGS+= -lc89
2+
export_dynamic = -Wl,-Bexport
23

34
%.so: %.o
45
$(LD) -G -Bdynamic -o $@ $<

src/makefiles/Makefile.unixware

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LDFLAGS+= -Wl,-Bexport
1+
export_dynamic = -Wl,-Bexport
22

33
%.so: %.o
44
$(LD) -G -Bdynamic -o $@ $<

src/template/hpux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if test "$GCC" = yes ; then
77
DL_LIB=/usr/lib/libdld.sl
88
CCC=g++
99
else
10-
CFLAGS='-Wl,-E -Ae'
10+
CFLAGS=-Ae
1111
SHARED_LIB=+z
1212
CPP='cc -E -Ae'
1313
CCC=aCC

0 commit comments

Comments
 (0)