From 3bc8f29c57d9ee8be66559e8503ab47f523af0e0 Mon Sep 17 00:00:00 2001 From: Wan-Teh Chang Date: Fri, 5 Feb 2010 18:27:00 -0800 Subject: [PATCH] Bug 529319: Use LIB_SUFFIX instead of IMPORT_LIB_SUFFIX for NSS import libraries because NSS uses a different import library suffix (.a) for MinGW (Mozilla uses dll.a), but NSS's import library suffix is the same as Mozilla's LIB_SUFFIX on all platforms. The patch is contributed by Jacek Caban . r=wtc. --- configure.in | 8 ++++---- security/manager/Makefile.in | 9 ++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/configure.in b/configure.in index 401e34552b3..0c7d4719c87 100644 --- a/configure.in +++ b/configure.in @@ -4383,10 +4383,10 @@ else if test -z "$GNU_CC" && test "$OS_ARCH" = "WINNT" -o "$OS_ARCH" = "WINCE" -o "$OS_ARCH" = "OS2"; then NSS_LIBS="\ \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \ - \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)smime$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \ - \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)ssl$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \ - \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nss$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \ - \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nssutil$NSS_VERSION.\$(IMPORT_LIB_SUFFIX)" + \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)smime$NSS_VERSION.\$(LIB_SUFFIX) \ + \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)ssl$NSS_VERSION.\$(LIB_SUFFIX) \ + \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nss$NSS_VERSION.\$(LIB_SUFFIX) \ + \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nssutil$NSS_VERSION.\$(LIB_SUFFIX)" else NSS_LIBS='$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lnssutil$NSS_VERSION" fi diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in index b5ea954f049..84340c2eaa0 100644 --- a/security/manager/Makefile.in +++ b/security/manager/Makefile.in @@ -69,10 +69,10 @@ ifndef MOZ_NATIVE_NSS ifneq (,$(filter OS2 WINCE WINNT,$(OS_ARCH))) SDK_LIBS = \ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \ - $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(IMPORT_LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)smime3.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)ssl3.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \ $(NULL) else SDK_LIBS = \ @@ -182,7 +182,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1 -DEFAULT_GMAKE_FLAGS += IMPORT_LIB_SUFFIX=".$(IMPORT_LIB_SUFFIX)" DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)" ifndef MOZ_NATIVE_SQLITE DEFAULT_GMAKE_FLAGS += SQLITE=$(call EXPAND_LIBNAME,mozsqlite3)