mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 18:08:58 +00:00
Bugzilla bug #65918: do not build shared libraries on OSF1 with the -all
linker option. The temporary workaround in two makefiles were removed. Modified Files: coreconf/OSF1.mk nss/lib/ckfw/builtins/Makefile nss/lib/fortcrypt/swfort/pkcs11/Makefile
This commit is contained in:
parent
fbdd098b71
commit
cb0969a8ae
@ -62,5 +62,5 @@ ifeq ($(USE_PTHREADS),1)
|
||||
endif
|
||||
|
||||
# The command to build a shared library on OSF1.
|
||||
MKSHLIB += ld -shared -all -expect_unresolved "*" -soname $(notdir $@)
|
||||
MKSHLIB += ld -shared -expect_unresolved "*" -soname $(notdir $@)
|
||||
DSO_LDOPTS += -shared
|
||||
|
@ -30,7 +30,7 @@
|
||||
# may use your version of this file under either the MPL or the
|
||||
# GPL.
|
||||
#
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.5 $ $Date: 2000/10/13 22:42:53 $ $Name: $"
|
||||
MAKEFILE_CVS_ID = "@(#) $RCSfile: Makefile,v $ $Revision: 1.6 $ $Date: 2001/01/22 17:16:45 $ $Name: $"
|
||||
|
||||
include manifest.mn
|
||||
include $(CORE_DEPTH)/coreconf/config.mk
|
||||
@ -49,11 +49,6 @@ EXTRA_LIBS = \
|
||||
|
||||
else
|
||||
|
||||
# OSF 1 linker is very agressive. It includes the entire archive,
|
||||
# not just the .o's that we need from that archive.
|
||||
#
|
||||
ifneq ($(OS_ARCH), OSF1)
|
||||
|
||||
ifeq ($(OS_ARCH), OS2)
|
||||
PLC_STATIC_LIB = $(DIST)/lib/plc4.$(LIB_SUFFIX)
|
||||
PLDS_STATIC_LIB = $(DIST)/lib/plds4.$(LIB_SUFFIX)
|
||||
@ -70,7 +65,6 @@ EXTRA_LIBS += \
|
||||
$(NULL)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
|
@ -68,11 +68,7 @@ else
|
||||
|
||||
# $(DIST)/lib/libdbm.a
|
||||
# $(DIST)/lib/libnspr3.a
|
||||
# OSF 1 linker is very agressive. It includes the entire archive,
|
||||
# not just the .o's that we need from that archive.
|
||||
#
|
||||
ifneq ($(OS_ARCH), OSF1)
|
||||
|
||||
CRYPTO_LIB = $(DIST)/lib/libfreebl.$(LIB_SUFFIX)
|
||||
|
||||
ifdef MOZILLA_SECURITY_BUILD
|
||||
@ -101,7 +97,6 @@ EXTRA_LIBS += \
|
||||
$(NULL)
|
||||
|
||||
endif
|
||||
endif
|
||||
|
||||
#ifeq ($(OS_TARGET), WIN16)
|
||||
#W16LIBS += $(SWCILIB)
|
||||
|
Loading…
Reference in New Issue
Block a user