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.
This commit is contained in:
wtc%netscape.com 2003-04-03 14:48:00 +00:00
Родитель 9f38986de0
Коммит 4627ba7a34
1 изменённых файлов: 4 добавлений и 24 удалений

Просмотреть файл

@ -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