Bugzilla bug 217504: 1. Do not use -lsvld on recent AIX releases.
2. Specify the standard AIX libpath, otherwise the directories we pass to the -L linker flags get added to the libpath. 3. Support building on AIX 5.2. The patch is contributed by Philip K. Warren <pkw@us.ibm.com>. r=wtc. a=asa for checkin to Mozilla 1.5. Modified Files: AIX.mk AIX4.2.mk AIX4.3.mk AIX5.1.mk Added Files: AIX5.2.mk Tag: NSS_3_8_BRANCH git-svn-id: svn://10.0.0.236/branches/NSS_3_8_BRANCH@146455 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -71,7 +71,6 @@ endif
|
||||
|
||||
AIX_WRAP = $(DIST)/lib/aixwrap.o
|
||||
AIX_TMP = $(OBJDIR)/_aix_tmp.o
|
||||
OS_LIBS += -lsvld
|
||||
ifdef MAPFILE
|
||||
EXPORT_RULES = -bexport:$(MAPFILE)
|
||||
endif
|
||||
|
||||
@@ -38,7 +38,7 @@ include $(CORE_DEPTH)/coreconf/AIX.mk
|
||||
|
||||
OS_CFLAGS += -DAIX4_2
|
||||
DSO_LDOPTS = -brtl -bM:SRE -bnoentry
|
||||
MKSHLIB = $(LD) $(DSO_LDOPTS) -lsvld -L/usr/lpp/xlC/lib -lc -lm
|
||||
MKSHLIB = $(LD) $(DSO_LDOPTS) -L/usr/lpp/xlC/lib -lc -lm
|
||||
|
||||
OS_LIBS += -L/usr/lpp/xlC/lib -lc -lm
|
||||
ifdef MAPFILE
|
||||
|
||||
@@ -45,9 +45,9 @@ ifeq ($(USE_64), 1)
|
||||
endif
|
||||
OS_CFLAGS += -DAIX4_3
|
||||
DSO_LDOPTS = -brtl -bM:SRE -bnoentry
|
||||
MKSHLIB = $(LD) $(DSO_LDOPTS) -lsvld -L/usr/lpp/xlC/lib -lc -lm
|
||||
MKSHLIB = $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
|
||||
|
||||
OS_LIBS += -L/usr/lpp/xlC/lib -lc -lm
|
||||
OS_LIBS += -blibpath:/usr/lib:/lib -lc -lm
|
||||
ifdef MAPFILE
|
||||
DSO_LDOPTS += -bexport:$(MAPFILE)
|
||||
else
|
||||
|
||||
@@ -44,9 +44,9 @@ ifeq ($(USE_64), 1)
|
||||
export OBJECT_MODE
|
||||
endif
|
||||
DSO_LDOPTS = -brtl -bM:SRE -bnoentry
|
||||
MKSHLIB = $(LD) $(DSO_LDOPTS) -lsvld -L/usr/lpp/xlC/lib -lc -lm
|
||||
MKSHLIB = $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
|
||||
|
||||
OS_LIBS += -L/usr/lpp/xlC/lib -lc -lm
|
||||
OS_LIBS += -blibpath:/usr/lib:/lib -lc -lm
|
||||
ifdef MAPFILE
|
||||
DSO_LDOPTS += -bexport:$(MAPFILE)
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user