diff options
| author | nelson%bolyard.com <devnull@localhost> | 2006-10-02 05:18:13 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2006-10-02 05:18:13 +0000 |
| commit | 2218c9ae49299ef6d0c19e57a08098d83877a1db (patch) | |
| tree | c7b56a7b7be2b6b73bd79dd4e010fb7bd21c4e48 | |
| parent | 2ee721031c6995efb1b626fbf1dd2742099da7c2 (diff) | |
| download | nss-hg-2218c9ae49299ef6d0c19e57a08098d83877a1db.tar.gz | |
Bug 353475. When building NSS with MSVC 2005, use the "mt" command to
embed the manifest files into the executables and DLLs.
Patch contributed by Allan Beaufour <allan@beaufour.dk>, r=nelson,wtchang
| -rw-r--r-- | security/coreconf/WIN32.mk | 1 | ||||
| -rw-r--r-- | security/coreconf/rules.mk | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk index e2c851201..3cc45aa7a 100644 --- a/security/coreconf/WIN32.mk +++ b/security/coreconf/WIN32.mk @@ -61,6 +61,7 @@ else RANLIB = echo BSDECHO = echo RC = rc.exe + MT = mt.exe endif ifdef BUILD_TREE diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index fd1a4bb6a..250da080e 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -275,6 +275,12 @@ $(PROGRAM): $(OBJS) $(EXTRA_LIBS) @$(MAKE_OBJDIR) ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) $(MKPROG) $(subst /,\\,$(OBJS)) -Fe$@ -link $(LDFLAGS) $(subst /,\\,$(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)) +ifdef MT + if test -f $@.manifest; then \ + $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ + rm -f $@.manifest; \ + fi +endif # MSVC with manifest tool else ifdef XP_OS2_VACPP $(MKPROG) -Fe$@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) @@ -329,6 +335,12 @@ ifdef NS_USE_GCC $(LINK_DLL) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES) else $(LINK_DLL) -MAP $(DLLBASE) $(subst /,\\,$(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) $(LD_LIBS) $(RES)) +ifdef MT + if test -f $@.manifest; then \ + $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;2; \ + rm -f $@.manifest; \ + fi +endif # MSVC with manifest tool endif else ifdef XP_OS2_VACPP @@ -367,6 +379,12 @@ $(OBJDIR)/$(PROG_PREFIX)%$(PROG_SUFFIX): $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX) ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) $(MKPROG) $< -Fe$@ -link \ $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) +ifdef MT + if test -f $@.manifest; then \ + $(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ + rm -f $@.manifest; \ + fi +endif # MSVC with manifest tool else $(MKPROG) -o $@ $(CFLAGS) $< \ $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) |