winbuild: Free name $(CC) in Makefile (#950)

In the old line number 290, CC and CURL_CC had the same value. After
that, /DCURL_STATICLIB was added to CC but not CURL_CC (intended?).

This gets rid of the CC variable entirely. It is a first step to make it
possible to manualyl set a CC variable in order to be able to change the
compiler.

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index d0b4bdda1a70dd4772042cb865c8032784db7cc7..f31d47a134dd0a5f63ae327ae3861720f5be1d73 100644 (file)
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -276,15 +276,11 @@ CFGSET = true
 \r
 !IF "$(DEBUG)"=="yes"\r
 RC_FLAGS = /dDEBUGBUILD=1 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc\r
-CC              = $(CC_DEBUG) $(RTLIB_DEBUG)\r
-\r
-CURL_CC         = $(CC)\r
+CURL_CC       = $(CC_DEBUG) $(RTLIB_DEBUG)\r
 CURL_RC_FLAGS = /i../include /dDEBUGBUILD=1 /Fo $@ $(CURL_SRC_DIR)\curl.rc\r
 !ELSE\r
 RC_FLAGS = /dDEBUGBUILD=0 /Fo $@ $(LIBCURL_SRC_DIR)\libcurl.rc\r
-CC              = $(CC_NODEBUG) $(RTLIB)\r
-\r
-CURL_CC         = $(CC)\r
+CURL_CC       = $(CC_NODEBUG) $(RTLIB)\r
 CURL_RC_FLAGS = /i../include /dDEBUGBUILD=0 /Fo $@ $(CURL_SRC_DIR)\curl.rc\r
 !ENDIF\r
 \r
@@ -315,7 +311,7 @@ TARGET   = $(LIB_NAME_STATIC)
 PDB      = $(PDB_NAME_STATIC)\r
 !ENDIF\r
 LNK      = $(LNKLIB) $(WIN_LIBS) /out:$(LIB_DIROBJ)\$(TARGET)\r
-CC       = $(CC) $(CFLAGS_LIBCURL_STATIC)\r
+CURL_CC  = $(CURL_CC) $(CFLAGS_LIBCURL_STATIC)\r
 \r
 # AS_DLL\r
 !ENDIF\r
@@ -460,13 +456,13 @@ $(CURL_DIROBJ):
 .SUFFIXES: .c .obj .res\r
 \r
 {$(LIBCURL_SRC_DIR)\}.c{$(LIB_DIROBJ)\}.obj:\r
-       $(CC) $(CFLAGS) /Fo"$@"  $<\r
+       $(CURL_CC) $(CFLAGS) /Fo"$@"  $<\r
 \r
 {$(LIBCURL_SRC_DIR)\vauth\}.c{$(LIB_DIROBJ)\vauth\}.obj:\r
-       $(CC) $(CFLAGS) /Fo"$@"  $<\r
+       $(CURL_CC) $(CFLAGS) /Fo"$@"  $<\r
 \r
 {$(LIBCURL_SRC_DIR)\vtls\}.c{$(LIB_DIROBJ)\vtls\}.obj:\r
-       $(CC) $(CFLAGS) /Fo"$@"  $<\r
+       $(CURL_CC) $(CFLAGS) /Fo"$@"  $<\r
 \r
 $(LIB_DIROBJ)\libcurl.res: $(LIBCURL_SRC_DIR)\libcurl.rc\r
        rc $(RC_FLAGS)\r
@@ -501,7 +497,7 @@ $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
        $(MANIFESTTOOL)\r
 \r
 {$(CURL_SRC_DIR)\}.c{$(CURL_DIROBJ)\}.obj:\r
-       $(CC) $(CURL_CFLAGS) /Fo"$@"  $<\r
+       $(CURL_CC) $(CURL_CFLAGS) /Fo"$@"  $<\r
 \r
 $(CURL_DIROBJ)\tool_hugehelp.obj: $(CURL_SRC_DIR)\tool_hugehelp.c\r
        $(CURL_CC) $(CURL_CFLAGS) /Zm200 /Fo"$@" $(CURL_SRC_DIR)\tool_hugehelp.c\r