Bug 505731: Fix the linker option for shell32.lib on MinGW. The patch is SOFTOKEN_3_13_BRANCH
authorwtc%google.com
Wed, 02 Jun 2010 22:35:04 +0000
branchSOFTOKEN_3_13_BRANCH
changeset 9663 caf317413eba949a60624e59558d37b78011443d
parent 9658 436a457f6174a851c3ce213d87cf006ed384f343
child 9670 0a4ced2e9abdc1d0454fc2c65d6177a157e41934
push idunknown
push userunknown
push dateunknown
bugs505731
Bug 505731: Fix the linker option for shell32.lib on MinGW. The patch is contributed by Jacek Caban <jacek@codeweavers.com>. r=wtc. Tag: SOFTOKEN_3_13_BRANCH
security/nss/lib/freebl/config.mk
--- a/security/nss/lib/freebl/config.mk
+++ b/security/nss/lib/freebl/config.mk
@@ -80,18 +80,22 @@ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 
 # don't want the 32 in the shared library name
 SHARED_LIBRARY = $(OBJDIR)/$(DLL_PREFIX)$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX)
 
 RES     = $(OBJDIR)/$(LIBRARY_NAME).res
 RESNAME = freebl.rc
 
 ifndef WINCE
+ifdef NS_USE_GCC
+OS_LIBS += -lshell32
+else
 OS_LIBS += shell32.lib
 endif
+endif
 
 ifdef NS_USE_GCC
 EXTRA_SHARED_LIBS += \
 	-L$(DIST)/lib \
 	-L$(NSSUTIL_LIB_DIR) \
 	-lnssutil3 \
 	-L$(NSPR_LIB_DIR) \
 	-lnspr4 \