diff --git a/mozilla/security/coreconf/AIX.mk b/mozilla/security/coreconf/AIX.mk index 4e9429c1a84..365cb62c820 100644 --- a/mozilla/security/coreconf/AIX.mk +++ b/mozilla/security/coreconf/AIX.mk @@ -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 diff --git a/mozilla/security/coreconf/AIX4.2.mk b/mozilla/security/coreconf/AIX4.2.mk index 71280fdf78c..6975116b46b 100644 --- a/mozilla/security/coreconf/AIX4.2.mk +++ b/mozilla/security/coreconf/AIX4.2.mk @@ -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 diff --git a/mozilla/security/coreconf/AIX4.3.mk b/mozilla/security/coreconf/AIX4.3.mk index 43ce77bc073..c3788c15d8a 100644 --- a/mozilla/security/coreconf/AIX4.3.mk +++ b/mozilla/security/coreconf/AIX4.3.mk @@ -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 diff --git a/mozilla/security/coreconf/AIX5.1.mk b/mozilla/security/coreconf/AIX5.1.mk index daa999ba7d8..1d88c32e5c3 100644 --- a/mozilla/security/coreconf/AIX5.1.mk +++ b/mozilla/security/coreconf/AIX5.1.mk @@ -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