From e4cf1df857b255b4076bc727ef95571bd07a084e Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Tue, 6 May 1997 15:55:23 +0000 Subject: [PATCH] Removed unused lines. --- config/CONFIG.cygwin32 | 46 +++++++++++++----------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/config/CONFIG.cygwin32 b/config/CONFIG.cygwin32 index 652c38db8..03fd1f01c 100755 --- a/config/CONFIG.cygwin32 +++ b/config/CONFIG.cygwin32 @@ -3,32 +3,35 @@ # # This file is maintained by the EPICS community. -#BUILD_TYPE = Unix BUILD_TYPE = Host ARCH_CLASS = cygwin32 -CXX_INCLUDES = /usr/local/include/g++ - -GCC = gcc -ACC = gcc +GCC = gcc +G++ = g++ + +#========================== +# Fix for cygwin32 beta17.1 includes +CXX_INCLUDES = /usr/local/include/g++ +#========================== + +# Override values in CONFIG_SITE +ANSI=GCC +STANDARD=GCC +CPLUSPLUS=G++ + EXE=.exe OBJ=.o - - AR = ar _AR = $(AR) $(ARFLAGS) G++_AR = $(_AR) -CCC_AR = $(CCC) -xar -o ARCMD = $($(CPLUSPLUS)_AR) RANLIB = ranlib YACC = $(EYACC) LEX = $(ELEX) -G++ = g++ -CCC = true RMDIR = rm -rf MKDIR = mkdir CP=cp @@ -37,15 +40,6 @@ RM=rm -f CHMOD = xxxx WHAT = echo -ACC_ANSI_INVOKE_W_NO = $(ACC) -Xa -w -ACC_ANSI_INVOKE_W_YES = $(ACC) -Xa -ACC_STRICT_INVOKE_W_YES = $(ACC) -Xc -v -ACC_TRAD_INVOKE_W_NO = $(ACC) -Xs -w -ACC_TRAD_INVOKE_W_YES = $(ACC) -Xs -ACC_LD_FLAGS = -ACC_LD_LIBS = -SUNCC_TRAD_INVOKE_W_NO = $(ACC_TRAD_INVOKE_W_NO) -SUNCC_TRAD_INVOKE_W_YES = $(ACC_TRAD_INVOKE_W_YES) GCC_ANSI_INVOKE_W_NO = $(GCC) -ansi -w GCC_ANSI_INVOKE_W_YES = $(GCC) -ansi GCC_STRICT_INVOKE_W_YES = $(GCC) -ansi -Wall -pedantic @@ -68,11 +62,6 @@ LD_FLAGS_ANSI = $($(ANSI)_LD_FLAGS) LD_FLAGS_STRICT = $($(ANSI)_LD_FLAGS) CCOMPILER_LDFLAGS = $(LD_FLAGS_$(CMPLR)) -CCC_NORMAL_INVOKE_W_NO = $(CCC) +p -CCC_NORMAL_INVOKE_W_YES = $(CCC) +p +w -CCC_STRICT_INVOKE_W_YES = $(CCC) +p +w -CCC_LD_FLAGS = -L$(SPECIAL_LANG) -CCC_LD_LIBS = G++_NORMAL_INVOKE_W_NO = $(G++) -ansi -pedantic -w G++_NORMAL_INVOKE_W_YES = $(G++) -ansi -pedantic -Wall G++_STRICT_INVOKE_W_YES = $(G++) -ansi -pedantic -Wtraditional -Wall \ @@ -83,17 +72,10 @@ G++_STRICT_INVOKE_W_YES = $(G++) -ansi -pedantic -Wtraditional -Wall \ CXX_NORMAL = $($(CPLUSPLUS)_NORMAL_INVOKE_W_$(UNIX_WARN)) CXX_STRICT = $($(CPLUSPLUS)_STRICT_INVOKE_W_YES) -# GNU make likes CXX instead of CCC +# GNU make likes CXX CXX = $(CXX_$(CXXCMPLR)) # Static Build options -#ACC_SFLAGS_YES= -dn -ACC_SFLAGS_YES= -Bstatic -ACC_SLIBS_YES= -lw -lintl -Bdynamic -ldl -Bstatic -lXext -lX -ACC_SLIBS_NO= -ACC_SFLAGS_NO= -CC_SFLAGS_YES= -dn -CC_SFLAGS_NO= GCC_SFLAGS_YES= -static GCC_SFLAGS_NO=