Import CCHOME from the environment when building with GCC on Windows

Using the environment for such things is preferable to always having to
specify a CCHOME= command-line argument, and is akin to setting various
environment variables via vcvars32.bat for VC++ builds.

Also remove a blank line to make it more obvious that copying DLLs to the
t/ folder is part of the test-prep target. (This is one thing which
doesn't work if CCHOME has not been set and MinGW isn't installed in its
default location.)

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 0755960..c6170f9 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -290,7 +290,7 @@ BUILDOPT    += -DPERL_IMPLICIT_CONTEXT
 BUILDOPT       += -DPERL_IMPLICIT_SYS
 .ENDIF
 
-.IMPORT .IGNORE : PROCESSOR_ARCHITECTURE PROCESSOR_ARCHITEW6432 WIN64
+.IMPORT .IGNORE : PROCESSOR_ARCHITECTURE PROCESSOR_ARCHITEW6432 WIN64 CCHOME
 
 PROCESSOR_ARCHITECTURE *= x86
 
@@ -1412,7 +1412,6 @@ test-prep : all utils ..\pod\perltoc.pod
        $(XCOPY) $(PERLEXE) ..\t\$(NULL)
        $(XCOPY) $(PERLDLL) ..\t\$(NULL)
        $(XCOPY) $(GLOBEXE) ..\t\$(NULL)
-
 .IF "$(CCTYPE)" == "GCC"
 # If building with gcc versions 4.x.x or greater, then
 # the GCC helper DLL will also need copied to the test directory.