diff options
| author | wtchang%redhat.com <devnull@localhost> | 2005-10-10 23:30:12 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2005-10-10 23:30:12 +0000 |
| commit | fba06507c447ea6273d79307276b4354f89b41a4 (patch) | |
| tree | 10e0c8a9118716199dd18ed1060606454575f7ae | |
| parent | e4198e89046c1e9356f91e2bbd1e02182cc70439 (diff) | |
| download | nss-hg-fba06507c447ea6273d79307276b4354f89b41a4.tar.gz | |
Bug 311402: upgraded the NSS version on the MOZILLA_1_8_BRANCH to
NSS 3.10.2 Beta 2, which we expect will be the same as NSS 3.10.2 final.
a=asa for mozilla1.8rc1.
Tag: MOZILLA_1_8_BRANCH
| -rw-r--r-- | security/coreconf/OS2.mk | 2 | ||||
| -rw-r--r-- | security/coreconf/arch.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk index b95328a36..4c965531f 100644 --- a/security/coreconf/OS2.mk +++ b/security/coreconf/OS2.mk @@ -89,7 +89,7 @@ MKSHLIB = $(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@ MKCSHLIB = $(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@ MKSHLIB_FORCE_ALL = MKSHLIB_UNFORCE_ALL = -DSO_LDOPTS = -Zomf -Zdll +DSO_LDOPTS = -Zomf -Zdll -Zmap SHLIB_LDSTARTFILE = SHLIB_LDENDFILE = ifdef MAPFILE diff --git a/security/coreconf/arch.mk b/security/coreconf/arch.mk index f3ceec3c2..aaf812175 100644 --- a/security/coreconf/arch.mk +++ b/security/coreconf/arch.mk @@ -210,6 +210,10 @@ ifeq ($(OS_ARCH),CYGWIN_98-4.10) OS_ARCH = CYGWIN_NT-4.0 OS_TARGET = WIN95 endif +ifeq ($(OS_ARCH),CYGWIN_ME-4.90) + OS_ARCH = CYGWIN_NT-4.0 + OS_TARGET = WIN95 +endif # # On WIN32, we also define the variable CPU_ARCH, if it isn't already. |