In perl.git, the branch blead has been updated

<https://perl5.git.perl.org/perl.git/commitdiff/15f42aa08dac5b9663cdd36757efe1b86bfd2ef2?hp=fa126b815dff7ae97d41fddc66264801f119e5ce>

- Log -----------------------------------------------------------------
commit 15f42aa08dac5b9663cdd36757efe1b86bfd2ef2
Author: Tony Cook <t...@develop-help.com>
Date:   Wed Sep 12 15:49:25 2018 +1000

    mention gmake builds in a few more places.

commit 8f5d02f0ba4fc4b2aaac2a4098691883b5e450ee
Author: Tony Cook <t...@develop-help.com>
Date:   Wed Sep 12 15:48:27 2018 +1000

    (perl #133494) better document CCHOME for GCC builds

-----------------------------------------------------------------------

Summary of changes:
 README.win32      | 38 ++++++++++++++++++++++----------------
 win32/GNUmakefile |  3 +++
 win32/makefile.mk |  3 +++
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/README.win32 b/README.win32
index 8244222785..0d34d9f618 100644
--- a/README.win32
+++ b/README.win32
@@ -321,7 +321,7 @@ MinGW64 (version 4.4.3 or later).  It can be downloaded 
here:
 L<http://www.mingw.org/>
 L<http://www.mingw-w64.org/>
 
-You also need dmake.  See L</"Make"> above on how to get it.
+You also need dmake or gmake.  See L</"Make"> above on how to get it.
 
 Note that the MinGW build currently requires a MinGW runtime version earlier
 than 3.21 (check __MINGW32_MAJOR_VERSION and __MINGW32_MINOR_VERSION).
@@ -355,14 +355,15 @@ unlike GCC.
 Make sure you are in the "win32" subdirectory under the perl toplevel.
 This directory contains a "Makefile" that will work with
 versions of nmake that come with Visual C++ or the Windows SDK, and
-a dmake "makefile.mk" that will work for all supported compilers.  The
-defaults in the dmake makefile are setup to build using MinGW/gcc.
+a GNU make "GNUmakefile" or dmake "makefile.mk" that will work for all
+supported compilers.  The defaults in the gmake and dmake makefile are
+setup to build using MinGW/gcc.
 
 =item *
 
-Edit the makefile.mk (or Makefile, if you're using nmake) and change
-the values of INST_DRV and INST_TOP.   You can also enable various
-build flags.  These are explained in the makefiles.
+Edit the GNUmakefile, makefile.mk (or Makefile, if you're using nmake)
+and change the values of INST_DRV and INST_TOP.   You can also enable
+various build flags.  These are explained in the makefiles.
 
 Note that it is generally not a good idea to try to build a perl with
 INST_DRV and INST_TOP set to a path that already exists from a previous
@@ -372,7 +373,9 @@ may end up building against the installed perl's lib/CORE 
directory rather
 than the one being tested.
 
 You will have to make sure that CCTYPE is set correctly and that
-CCHOME points to wherever you installed your compiler.
+CCHOME points to wherever you installed your compiler.  For GCC this
+should be the directory that contains the F<bin>, F<include> and
+F<lib> directories.
 
 If building with the cross-compiler provided by
 mingw-w64.org you'll need to uncomment the line that sets
@@ -399,7 +402,7 @@ Be sure to read the instructions near the top of the 
makefiles carefully.
 
 =item *
 
-Type "dmake" (or "nmake" if you are using that make).
+Type "dmake" ("gmake" for GNU make, or "nmake" if you are using that make).
 
 This should build everything.  Specifically, it will create perl.exe,
 perl529.dll at the perl toplevel, and various other extension dll's
@@ -411,6 +414,9 @@ of parallel jobs you want to run. A number of things in the 
build process will
 run in parallel, but there are serialization points where you will see just 1
 CPU maxed out. This is normal.
 
+Similarly you can build in parallel with GNU make, type "gmake -j2" to
+build with two parallel jobs, or higher for more.
+
 If you are advanced enough with building C code, here is a suggestion to speed
 up building perl, and the later C<make test>. Try to keep your PATH 
enviromental
 variable with the least number of folders possible (remember to keep your C
@@ -422,8 +428,8 @@ is the most commonly launched program during the build and 
later testing.
 
 =head2 Testing Perl on Windows
 
-Type "dmake test" (or "nmake test").  This will run most of the tests from
-the testsuite (many tests will be skipped).
+Type "dmake test" (or "gmake test", "nmake test").  This will run most
+of the tests from the testsuite (many tests will be skipped).
 
 There should be no test failures.
 
@@ -457,11 +463,11 @@ Please report any other failures as described under 
L</BUGS AND CAVEATS>.
 
 =head2 Installation of Perl on Windows
 
-Type "dmake install" (or "nmake install").  This will put the newly
-built perl and the libraries under whatever C<INST_TOP> points to in the
-Makefile.  It will also install the pod documentation under
-C<$INST_TOP\$INST_VER\lib\pod> and HTML versions of the same under
-C<$INST_TOP\$INST_VER\lib\pod\html>.
+Type "dmake install" (or "gmake install", "nmake install").  This will
+put the newly built perl and the libraries under whatever C<INST_TOP>
+points to in the Makefile.  It will also install the pod documentation
+under C<$INST_TOP\$INST_VER\lib\pod> and HTML versions of the same
+under C<$INST_TOP\$INST_VER\lib\pod\html>.
 
 To use the Perl you just installed you will need to add a new entry to
 your PATH environment variable: C<$INST_TOP\bin>, e.g.
@@ -651,7 +657,7 @@ CPAN.
 
 L<http://www.cpan.org/modules/by-module/Make/>
 
-You may also use dmake.  See L</"Make"> above on how to get it.
+You may also use dmake or gmake.  See L</"Make"> above on how to get it.
 
 Note that MakeMaker actually emits makefiles with different syntax
 depending on what 'make' it thinks you are using.  Therefore, it is
diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index 0f226b7ada..5d9e1fbed9 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -250,6 +250,9 @@ DEFAULT_INC_EXCLUDES_DOT := define
 # Running VCVARS32.BAT, VCVARSALL.BAT or similar is *required* when using
 # Visual C++.
 #
+# For GCC builds this should be the directory containing the bin, include,
+# lib directories for your compiler.
+#
 #CCHOME                := C:\MinGW
 
 #
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 77f0512d08..414a8494b4 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -240,6 +240,9 @@ DEFAULT_INC_EXCLUDES_DOT *= define
 # Running VCVARS32.BAT, VCVARSALL.BAT or similar is *required* when using
 # Visual C++.
 #
+# For GCC builds this should be the directory containing the bin, include,
+# lib directories for your compiler.
+#
 
 #CCHOME                *= C:\MinGW
 

-- 
Perl5 Master Repository

Reply via email to