File tree 9 files changed +16
-13
lines changed
9 files changed +16
-13
lines changed Original file line number Diff line number Diff line change 6
6
# Copyright (c) 1998, Regents of the University of California
7
7
#
8
8
# IDENTIFICATION
9
- # $PostgreSQL: pgsql/src/Makefile.shlib,v 1.116 2008/04/08 09 :50:29 petere Exp $
9
+ # $PostgreSQL: pgsql/src/Makefile.shlib,v 1.117 2008/09/01 08 :50:09 petere Exp $
10
10
#
11
11
#-------------------------------------------------------------------------
12
12
@@ -256,10 +256,9 @@ endif
256
256
257
257
ifeq ($(PORTNAME), solaris)
258
258
ifeq ($(GCC), yes)
259
- LINK.shared = $(COMPILER) -shared # $(COMPILER) needed for -m64
259
+ LINK.shared = $(COMPILER) -shared
260
260
else
261
- # CFLAGS added for X86_64
262
- LINK.shared = $(CC) -G $(CFLAGS)
261
+ LINK.shared = $(COMPILER) -G
263
262
endif
264
263
ifdef soname
265
264
ifeq ($(with_gnu_ld), yes)
Original file line number Diff line number Diff line change @@ -38,6 +38,6 @@ MKLDEXPORT=$(top_srcdir)/src/backend/port/aix/mkldexport.sh
38
38
$(MKLDEXPORT) $^ >$@
39
39
40
40
%$(DLSUFFIX): %.o %.exp
41
- $(CC) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(SHLIB_LINK)
41
+ $(CC) $(CFLAGS) $( LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bE:$*.exp $(SHLIB_LINK)
42
42
43
43
sqlmansect = 7
Original file line number Diff line number Diff line change @@ -21,6 +21,6 @@ CFLAGS_SL =
21
21
endif
22
22
23
23
%.so: %.o
24
- $(CC) -shared -o $@ $<
24
+ $(CC) $(CFLAGS) -shared -o $@ $<
25
25
26
26
sqlmansect = 7
Original file line number Diff line number Diff line change 16
16
17
17
%.so: %.o
18
18
ifdef ELF_SYSTEM
19
- $(LD) -x -shared -o $@ $<
19
+ $(CC) $(CFLAGS) -shared -o $@ $<
20
20
else
21
21
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
22
22
@echo building shared object $@
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ DLSUFFIX = .so
6
6
CFLAGS_SL =
7
7
8
8
%.so: %.o
9
- $(LD) -G -Bdynamic -shared -o $@ $<
9
+ $(CC) $(CFLAGS) -shared -o $@ $<
10
10
11
11
override CPPFLAGS += -U_NO_XOPEN4
12
12
Original file line number Diff line number Diff line change @@ -11,6 +11,6 @@ CFLAGS_SL = -fpic
11
11
endif
12
12
13
13
%.so: %.o
14
- $(CC) -shared -o $@ $<
14
+ $(CC) $(CFLAGS) -shared -o $@ $<
15
15
16
16
sqlmansect = 7
Original file line number Diff line number Diff line change 18
18
19
19
%.so: %.o
20
20
ifdef ELF_SYSTEM
21
- $(LD) -x -Bshareable -o $@ $<
21
+ $(CC) $(CFLAGS) -shared -o $@ $<
22
22
else
23
23
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
24
24
@echo building shared object $@
Original file line number Diff line number Diff line change 16
16
17
17
%.so: %.o
18
18
ifdef ELF_SYSTEM
19
- $(CC) -shared -o $@ $<
19
+ $(CC) $(CFLAGS) -shared -o $@ $<
20
20
else
21
21
$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
22
22
@echo building shared object $@
Original file line number Diff line number Diff line change 1
- # $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.13 2005/12/09 21:19:36 petere Exp $
1
+ # $PostgreSQL: pgsql/src/makefiles/Makefile.solaris,v 1.14 2008/09/01 08:50:10 petere Exp $
2
2
3
3
AROPT = crs
4
4
@@ -17,6 +17,10 @@ CFLAGS_SL = -KPIC
17
17
endif
18
18
19
19
%.so: %.o
20
- $(LD) -G -Bdynamic -o $@ $<
20
+ ifeq ($(GCC), yes)
21
+ $(CC) $(CFLAGS) -shared -o $@ $<
22
+ else
23
+ $(CC) $(CFLAGS) -G -o $@ $<
24
+ endif
21
25
22
26
sqlmansect = 5sql
You can’t perform that action at this time.
0 commit comments