diff options
| author | wtc%netscape.com <devnull@localhost> | 2003-04-03 14:48:00 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2003-04-03 14:48:00 +0000 |
| commit | 77103bcc7a0ea6474733f612434ef98d6677a775 (patch) | |
| tree | 37ecbffccbb588eea2c78dc1482e31a7011b78aa | |
| parent | e8df0acbdde2864f88ca4f55c1ed64a397f2c04f (diff) | |
| download | nss-hg-77103bcc7a0ea6474733f612434ef98d6677a775.tar.gz | |
Backed out the previous checkin, which broke our NT nightly build. It seems
that USE_CYGWIN is set (to some strange value) under MKS shell.
| -rw-r--r-- | security/coreconf/rules.mk | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index 74235fb2d..ac55f9279 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -380,29 +380,17 @@ WCCFLAGS1 := $(subst /,\\,$(CFLAGS)) WCCFLAGS2 := $(subst -I,-i=,$(WCCFLAGS1)) WCCFLAGS3 := $(subst -D,-d,$(WCCFLAGS2)) -ifeq (,$(filter-out WIN%,$(OS_TARGET))) -USE_CYGWIN := $(if $(findstring ;,$(PATH)),,1)) -endif - $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c @$(MAKE_OBJDIR) ifdef USE_NT_C_SYNTAX -ifdef USE_CYGWIN - $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell cygpath -a -w $<)) -else - $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) -endif + $(CC) -Fo$@ -c $(CFLAGS) $< else $(CC) -o $@ -c $(CFLAGS) $< endif $(PROG_PREFIX)%$(OBJ_SUFFIX): %.c ifdef USE_NT_C_SYNTAX -ifdef USE_CYGWIN - $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell cygpath -a -w $<)) -else - $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) -endif + $(CC) -Fo$@ -c $(CFLAGS) $< else $(CC) -o $@ -c $(CFLAGS) $< endif @@ -430,11 +418,7 @@ $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S $(OBJDIR)/$(PROG_PREFIX)%: %.cpp @$(MAKE_OBJDIR) ifdef USE_NT_C_SYNTAX -ifdef USE_CYGWIN - $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell cygpath -a -w $<)) -else - $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) -endif + $(CCC) -Fo$@ -c $(CFLAGS) $< else $(CCC) -o $@ -c $(CFLAGS) $< endif @@ -454,11 +438,7 @@ ifdef STRICT_CPLUSPLUS_SUFFIX rm -f $(OBJDIR)/t_$*.cc else ifdef USE_NT_C_SYNTAX -ifdef USE_CYGWIN - $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell cygpath -a -w $<)) -else - $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) -endif + $(CCC) -Fo$@ -c $(CFLAGS) $< else $(CCC) -o $@ -c $(CFLAGS) $< endif |