diff options
| author | nelsonb%netscape.com <devnull@localhost> | 2002-02-15 22:54:08 +0000 |
|---|---|---|
| committer | nelsonb%netscape.com <devnull@localhost> | 2002-02-15 22:54:08 +0000 |
| commit | 738456c67ff3fb409226a12e51fb0ca563e3d909 (patch) | |
| tree | dfbe428591494ceaf2ae25c831889dc85656ad31 /security/nss/lib/ckfw | |
| parent | 526d8ca9a9340281ac8b28404fbc6ddf692f4f2b (diff) | |
| download | nss-hg-738456c67ff3fb409226a12e51fb0ca563e3d909.tar.gz | |
Change most coreconf and NSS makefiles to use OS_TARGET (which can
be overridden via an environment variable) rather than OS_ARCH.
This is a precursor to more flexibility in cross-platform builds.
Bug 104541.
Diffstat (limited to 'security/nss/lib/ckfw')
| -rw-r--r-- | security/nss/lib/ckfw/builtins/Makefile | 8 | ||||
| -rw-r--r-- | security/nss/lib/ckfw/builtins/config.mk | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/security/nss/lib/ckfw/builtins/Makefile b/security/nss/lib/ckfw/builtins/Makefile index ca036297f..d58e910d9 100644 --- a/security/nss/lib/ckfw/builtins/Makefile +++ b/security/nss/lib/ckfw/builtins/Makefile @@ -41,8 +41,8 @@ EXTRA_LIBS = \ $(DIST)/lib/$(LIB_PREFIX)nssb.$(LIB_SUFFIX) \ $(NULL) -# can't do this in manifest.mn because OS_ARCH isn't defined there. -ifeq ($(OS_ARCH), WINNT) +# can't do this in manifest.mn because OS_TARGET isn't defined there. +ifeq (,$(filter-out WIN%,$(OS_TARGET))) EXTRA_LIBS += \ $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ @@ -71,7 +71,7 @@ generate: # This'll need some help from a build person. -ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) +ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.1) DSO_LDOPTS = -bM:SRE -bh:4 -bnoentry EXTRA_DSO_LDOPTS = -lc MKSHLIB = xlC $(DSO_LDOPTS) @@ -84,7 +84,7 @@ $(SHARED_LIBRARY): $(OBJS) endif -ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2) +ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.2) LD += -G endif diff --git a/security/nss/lib/ckfw/builtins/config.mk b/security/nss/lib/ckfw/builtins/config.mk index 29063b0fd..cccc96eb8 100644 --- a/security/nss/lib/ckfw/builtins/config.mk +++ b/security/nss/lib/ckfw/builtins/config.mk @@ -42,17 +42,17 @@ LIBRARY = IMPORT_LIBRARY = PROGRAM = -ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH))) - SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll +ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) + SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).dll endif ifdef BUILD_IDG -DEFINES += -DNSSDEBUG + DEFINES += -DNSSDEBUG endif # # To create a loadable module on Darwin, we must use -bundle. # -ifeq ($(OS_ARCH),Darwin) +ifeq ($(OS_TARGET),Darwin) DSO_LDOPTS := $(subst -dynamiclib,-bundle,$(DSO_LDOPTS)) endif |