diff options
| author | Wan-Teh Chang <wtc@google.com> | 2015-07-01 10:00:48 -0700 |
|---|---|---|
| committer | Wan-Teh Chang <wtc@google.com> | 2015-07-01 10:00:48 -0700 |
| commit | c4958331205cecd12d18efc282de77d02810ffe4 (patch) | |
| tree | 6f88aabcdf034eb2794fa5209ad9ef16c85eb345 | |
| parent | 738491f849c2795e3b381f2aedefbc8b45bce87f (diff) | |
| download | nspr-hg-c4958331205cecd12d18efc282de77d02810ffe4.tar.gz | |
Bug 1030692: Fix the static and import library names for the
OS_TARGET=WINNT build configuration. r=ted.
| -rw-r--r-- | config/rules.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config/rules.mk b/config/rules.mk index fc62184b..1c8fdc9b 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -83,11 +83,6 @@ ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH))) ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET))) SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb -else -SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -SHARED_LIB_PDB = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb -endif - ifdef MSC_VER LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) @@ -95,6 +90,12 @@ else LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) endif +else +SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) +SHARED_LIB_PDB = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb +LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) +IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) +endif else @@ -363,7 +364,7 @@ endif ifdef MOZ_PROFILE_GENERATE # Clean up profiling data during PROFILE_GENERATE phase export:: -ifeq ($(OS_ARCH)_$(NS_USE_GCC), WINNT_) +ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) $(foreach pgd,$(wildcard *.pgd),pgomgr -clear $(pgd);) else ifdef NS_USE_GCC |