diff options
| author | wtc%netscape.com <devnull@localhost> | 2001-02-01 21:42:49 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2001-02-01 21:42:49 +0000 |
| commit | 3bcd767bc6c4ac32dd55e3b5aaac0b314e5571fe (patch) | |
| tree | c9564111598e614d5093122a0d46966c4975e9f2 | |
| parent | c23f590fd2be0998942aa2d4afcbb443cd96f0df (diff) | |
| download | nss-hg-3bcd767bc6c4ac32dd55e3b5aaac0b314e5571fe.tar.gz | |
Bugzilla bug #62855: on NSS_3_1_BRANCH, we do not have a makefile rule to
build import libraries for OS/2, so do not set IMPORT_LIBRARY. Since
nssckbi.dll is always loaded dynamically, we don't need to build its
import library anyway. This patch is from Javier Pedemonte
<pedemont@us.ibm.com>.
(NSS_3_1_BRANCH)
| -rw-r--r-- | security/nss/lib/ckfw/builtins/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/security/nss/lib/ckfw/builtins/Makefile b/security/nss/lib/ckfw/builtins/Makefile index 3c45b94bc..3753b013d 100644 --- a/security/nss/lib/ckfw/builtins/Makefile +++ b/security/nss/lib/ckfw/builtins/Makefile @@ -73,11 +73,15 @@ endif endif -ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH))) +ifeq ($(OS_ARCH), WINNT) SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).lib endif +ifeq ($(OS_ARCH),OS2) + SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll +endif + include $(CORE_DEPTH)/coreconf/rules.mk |