Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 20:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OS/2 & Win32 non-gcc builds require that you link against their import library instead of directly against a shared library. Fixing static build bustage.

Browse Source 
Use the centralized NSS_LIBS rather than explicitly writing out each NSS lib when linking.
This commit is contained in:
seawood%netscape.com 2002-02-08 06:04:05 +00:00
parent 7764c7455d
commit bfd2d230fb
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/config.mk
View File

@ -172,6 +172,16 @@ endif
NSS_3_4=1
ifdef NSS_3_4
# win32 msvc & OS/2 VA builds use import libs
ifneq (,$(filter WINNT OS2,$(OS_ARCH)))
NSS_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)smime3.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)ssl3.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)nss3.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)softokn3.$(LIB_SUFFIX) \
$(NULL)
else
NSS_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)smime3$(DLL_SUFFIX) \
@ -179,6 +189,7 @@ NSS_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)nss3$(DLL_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)softokn3$(DLL_SUFFIX) \
$(NULL)
endif
else
NSS_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)smime.$(LIB_SUFFIX) \

21
security/manager/ssl/src/Makefile.in
View File

@ -100,30 +100,9 @@ NSS_3_4=1
ifdef NSS_3_4
DEFINES += -DNSS_3_4
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
# Link with import libs on OS/2
NSS3_LIB = nss3.$(LIB_SUFFIX)
SMIME3_LIB = smime3.$(LIB_SUFFIX)
SSL3_LIB = ssl3.$(LIB_SUFFIX)
SOFTOKEN3_LIB = softokn3.$(LIB_SUFFIX)
else
NSS3_LIB = $(LIB_PREFIX)nss3$(DLL_SUFFIX)
SMIME3_LIB = $(LIB_PREFIX)smime3$(DLL_SUFFIX)
SSL3_LIB = $(LIB_PREFIX)ssl3$(DLL_SUFFIX)
SOFTOKEN3_LIB = $(LIB_PREFIX)softokn3$(DLL_SUFFIX)
endif
EXTRA_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(SMIME3_LIB) \
$(DIST)/lib/$(SSL3_LIB) \
$(DIST)/lib/$(NSS3_LIB) \
$(DIST)/lib/$(SOFTOKEN3_LIB) \
$(NULL)
else
EXTRA_LIBS = $(NSS_LIBS)
endif
EXTRA_DEPS = $(EXTRA_LIBS)