diff options
| author | jpierre%netscape.com <devnull@localhost> | 2003-04-03 07:59:40 +0000 |
|---|---|---|
| committer | jpierre%netscape.com <devnull@localhost> | 2003-04-03 07:59:40 +0000 |
| commit | e8df0acbdde2864f88ca4f55c1ed64a397f2c04f (patch) | |
| tree | 3caee98cbf5bcde294a0a8fb7db7564902a14c46 | |
| parent | 1be67d750e4f93391552f608ec9bc37f848375a4 (diff) | |
| download | nss-hg-e8df0acbdde2864f88ca4f55c1ed64a397f2c04f.tar.gz | |
*** empty log message ***
| -rw-r--r-- | security/coreconf/rules.mk | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index ac55f9279..74235fb2d 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -380,17 +380,29 @@ 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 - $(CC) -Fo$@ -c $(CFLAGS) $< +ifdef USE_CYGWIN + $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell cygpath -a -w $<)) +else + $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) +endif else $(CC) -o $@ -c $(CFLAGS) $< endif $(PROG_PREFIX)%$(OBJ_SUFFIX): %.c ifdef USE_NT_C_SYNTAX - $(CC) -Fo$@ -c $(CFLAGS) $< +ifdef USE_CYGWIN + $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell cygpath -a -w $<)) +else + $(CC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) +endif else $(CC) -o $@ -c $(CFLAGS) $< endif @@ -418,7 +430,11 @@ $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S $(OBJDIR)/$(PROG_PREFIX)%: %.cpp @$(MAKE_OBJDIR) ifdef USE_NT_C_SYNTAX - $(CCC) -Fo$@ -c $(CFLAGS) $< +ifdef USE_CYGWIN + $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell cygpath -a -w $<)) +else + $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) +endif else $(CCC) -o $@ -c $(CFLAGS) $< endif @@ -438,7 +454,11 @@ ifdef STRICT_CPLUSPLUS_SUFFIX rm -f $(OBJDIR)/t_$*.cc else ifdef USE_NT_C_SYNTAX - $(CCC) -Fo$@ -c $(CFLAGS) $< +ifdef USE_CYGWIN + $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell cygpath -a -w $<)) +else + $(CCC) -Fo$@ -c $(CFLAGS) $(if $(findstring :,$<),$<,$(shell pwd)/$<) +endif else $(CCC) -o $@ -c $(CFLAGS) $< endif |