mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 03:45:46 +00:00
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. Modified Files: AIX.mk AIX4.2.mk AIX4.3.mk AIX5.1.mk Added Files: AIX5.2.mk
This commit is contained in:
parent
7aa1120b36
commit
ba1b555580
@ -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
|
||||
|
54
security/coreconf/AIX5.2.mk
Normal file
54
security/coreconf/AIX5.2.mk
Normal file
@ -0,0 +1,54 @@
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public
|
||||
# License Version 1.1 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS
|
||||
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
||||
# implied. See the License for the specific language governing
|
||||
# rights and limitations under the License.
|
||||
#
|
||||
# The Original Code is the Netscape security libraries.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1994-2000 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the
|
||||
# terms of the GNU General Public License Version 2 or later (the
|
||||
# "GPL"), in which case the provisions of the GPL are applicable
|
||||
# instead of those above. If you wish to allow use of your
|
||||
# version of this file only under the terms of the GPL and not to
|
||||
# allow others to use your version of this file under the MPL,
|
||||
# indicate your decision by deleting the provisions above and
|
||||
# replace them with the notice and other provisions required by
|
||||
# the GPL. If you do not delete the provisions above, a recipient
|
||||
# may use your version of this file under either the MPL or the
|
||||
# GPL.
|
||||
#
|
||||
# Config stuff for AIX5.2
|
||||
#
|
||||
|
||||
include $(CORE_DEPTH)/coreconf/AIX.mk
|
||||
|
||||
|
||||
ifeq ($(USE_64), 1)
|
||||
# Next line replaced by generic name handling in arch.mk
|
||||
# COMPILER_TAG = _64
|
||||
OS_CFLAGS += -DAIX_64BIT
|
||||
OBJECT_MODE=64
|
||||
export OBJECT_MODE
|
||||
endif
|
||||
DSO_LDOPTS = -brtl -bM:SRE -bnoentry
|
||||
MKSHLIB = $(LD) $(DSO_LDOPTS) -blibpath:/usr/lib:/lib -lc -lm
|
||||
|
||||
OS_LIBS += -blibpath:/usr/lib:/lib -lc -lm
|
||||
ifdef MAPFILE
|
||||
DSO_LDOPTS += -bexport:$(MAPFILE)
|
||||
else
|
||||
DSO_LDOPTS += -bexpall
|
||||
endif
|
Loading…
Reference in New Issue
Block a user