[m-rev.] for review: improve support for MSYS2 builds

Julien Fischer jfischer at opturion.com
Fri Jan 24 15:25:25 AEDT 2020
Previous message: [m-rev.] for review: improve support for MSYS2 builds
Next message: [m-rev.] [www]: diff: announce 20.01 release
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
On Fri, 24 Jan 2020, Peter Wang wrote:

> On Fri, 24 Jan 2020 13:58:33 +1100 (AEDT), Julien Fischer <jfischer at opturion.com> wrote:
>>
>> For review by Peter.
>>
>> This replaces my diff from yesterday; it preserves the possibility
>> of using MinGW-w64 cross-compiler.
>>
>> -------------------------------------
>>
>> Improve support for MSYS2 builds.
>>
>> MSYS2 provides a POSIX like environment and package manager for Windows.
>> It packages up the MinGW-w64 port of GCC.  (MSYS2 is separate from the
>> original MSYS.)

> Can you add your explanation of the MinGW, MinGW-w64, MSYS and MSYS2
> projects to the top of README.MinGW, and the host triplets involved?

Done.  (There's a new diff of README.MinGW below.)

>> diff --git a/README.MinGW b/README.MinGW
>> index 57df999..d6a5387 100644
>> --- a/README.MinGW
>> +++ b/README.MinGW
>> @@ -98,16 +98,22 @@ To build the source distribution under MSYS follow these steps:
>>       path with a drive letter (except use `/' instead of `\').
>>       Do not use a path like `/mercury', because that
>>       will be interpreted differently by the MSYS shell than by the generated
>> -    executables, resulting in a broken installation.
>> +    executables, resulting in a broken installation.
>>
>> -    If you are using the MSYS or MSYS2 shell with MinGW-w64 then you must also
>> -    invoke configure with the following option:
>> +    If you are using the MSYS shell with MinGW-w64 then you must also invoke
>> +    configure with the following option:
>>
>
> ... using the MSYS shell (not the MSYS2 shell) ...
>
>>          --host=x86_64-w64-mingw32
>>
>>       This will cause mmake to use the MinGW-w64 tool chain.  Ensure that the
>>       MinGW-w64 tools are in your PATH before running configure.
>>
>> +    If you are using the MSYS2 shell then you need to launch it in either
>> +    the "MSYS2 MinGW 32-bit" mode or the "MSYS2 MinGW 63-bit mode" to build
>
> Move the first end quote to after "mode".

Fixed.

> 63-bit

Fixed.

>
>> +    a 32- or 64-bit Mercury system respectively.  You do *not* need to pass
>> +    the --host=x86_64-w64-mingw32 option to configure on MSYS2; if you do
>> +    you will get a 64-bit compiler.
>> +
>
> Replace the last sentence with something like:
>
>    You do not need to pass the --host option to configure; it will
>    detect the 32-bit or 64-bit MSYS2 environment you are running in.

Done.

>> diff --git a/configure.ac b/configure.ac
>> index 281baef..3e7e10c 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -3277,12 +3277,22 @@ case "$host" in
>>           esac
>>           ;;
>>
>> -    *-w64-mingw*)
>> -        CFLAGS_FOR_THREADS="$WIN32_GC_THREADLIB"
>> -        BOEHM_CFLAGS_FOR_THREADS="-DGC_THREADS $WIN32_GC_THREADLIB"
>> -        THREAD_LIBS="-lpthread"
>> -        ENABLE_BOEHM_THREAD_LOCAL_ALLOC="-DTHREAD_LOCAL_ALLOC"
>> -        ENABLE_BOEHM_PARALLEL_MARK="-DPARALLEL_MARK"
>> +    *-w64-mingw*|x86_64-pc-mingw*)
>> +        THREAD_LIBS=""
>> +        case "$mercury_cv_cc_type" in
>> +            msvc)
>> +                CFLAGS_FOR_THREADS="-DGC_THREADS -MD"
>> +                LDFLAGS_FOR_THREADS="-MD"
>> +                LD_LIBFLAGS_FOR_THREADS="-MD"
>> +                ;;
>> +            *)
>> +                CFLAGS_FOR_THREADS="$WIN32_GC_THREADLIB"
>> +                BOEHM_CFLAGS_FOR_THREADS="-DGC_THREADS $WIN32_GC_THREADLIB"
>> +                THREAD_LIBS="-lpthread"
>> +                ENABLE_BOEHM_THREAD_LOCAL_ALLOC="-DTHREAD_LOCAL_ALLOC"
>> +                ENABLE_BOEHM_PARALLEL_MARK="-DPARALLEL_MARK"
>> +                ;;
>> +        esac
>>           ;;
>>
>
> Ok. I think we can merge this case with the preceding case for
> i*86-pc-mingw*, but commit this first.

The previous case is for the original MinGW; its handling of threads
is quite different from MinGW-w64.

The stuff with MSVC is quite undesirable; I think what we should
eventually do is make up our own configuration triple for MSVC and use that
instead throughout the system, e.g. i686-windows-msvc; that would pave
the way for supporting the 64-bit variant of MSVC as well.

Here's the new version of README.MinGW:

diff --git a/README.MinGW b/README.MinGW
index 57df999..85b76ca 100644
--- a/README.MinGW
+++ b/README.MinGW
@@ -1,21 +1,29 @@
  This file documents the port of Mercury to Windows using either the MinGW
  or MinGW-w64 ports of GCC, i.e. the i686-pc-mingw32, i686-w64-mingw32 or
-x86_64-w64-mingw32 configurations.
-
-NOTE: There are currently problems with 64-bit executables in the 'asm_fast*'
-grade.  The 'none*' and 'reg*' grades do appear to work correctly in our
-limited testing.
+x86_64-w64-mingw32, x86_64-pc-mingw32 and x86_64-pc-mingw64 configurations.

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

-BUILDING WITH MINGW
+BUILDING WITH MINGW OR MINGW-W64
+
+MinGW is a port of 32-bit GCC to Windows available from <http://www.mingw.org>.
+
+MinGW-w64 is a (different) port of both 64-bit and 32-bit GCC to Windows
+available from <http://mingw-w64.org>.

-Using the MinGW port of GCC you can build a Mercury compiler that can generate
-executables that will run natively on Windows without the need for a support
-environment like Cygwin.  Using the standard MinGW version of GCC will result
-in a Mercury compiler that generates 32-bit executables.  To build a Mercury
-compiler that generates 64-bit executables for Windows you will need to use the
-MinGW-w64 port of GCC.
+MSYS is a POSIX-like environment available from <http://www.mingw.org>.
+
+MSYS2 is a (different) POSIX-like environment.  It provides a package manager,
+and among the packages it provides are the MinGW-w64 ports of GCC.
+Note that MSYS2 is separate from the original MSYS.
+It is available at <https://msys2.github.io>.
+
+Using the MinGW or MinGW-w64 ports of GCC you can build a Mercury compiler that
+can generate executables that will run natively on Windows without the need for
+a support environments like Cygwin, MSYS or MSYS2.  Using the standard MinGW
+version of GCC will result in a Mercury compiler that generates 32-bit
+executables.  To build a Mercury compiler that generates 64-bit executables for
+Windows you will need to use the MinGW-w64 port of GCC.

  NOTE: a Unix like environment is required to build and install the Mercury
  compiler.  MSYS, MSYS2 or Cygwin can be used for this purpose.  A Unix like
@@ -45,7 +53,8 @@ To build the source distribution under MSYS follow these steps:
      MinGW-w64 version of GCC (available from <http://mingw-w64.org>) and
      ensure that it occurs in your PATH before the MinGW GCC.

-1b. Alternatively, download and install MSYS2 from <https://msys2.github.io>
+1b. Alternatively, download and install MSYS2 environment from
+    <https://msys2.github.io>

      You can use the MinGW-w64 version of GCC to build a copy of Mercury that
      generates 32-bit or 64-bit executables.  Start the "MinGW-w64 Win32 Shell"
@@ -59,8 +68,8 @@ To build the source distribution under MSYS follow these steps:
          pacman -S mingw-w64-i686-gcc
          pacman -S mingw-w64-x86_64-gcc

-2.  Optional: To build the java grade with MinGW and MSYS you will require
-    the Windows version of the JDK to be installed on your system.
+2.  Optional: To build the java grade with MinGW and MSYS / MSYS2 you will
+    require the Windows version of the JDK to be installed on your system.
      The Java compiler (javac), Java archive tool (jar), and Java runtime (java)
      needs to be in the MSYS PATH, for example do the following in the shell:

@@ -68,19 +77,19 @@ To build the source distribution under MSYS follow these steps:

      See README.Java for further details.

-    Optional: To build the C# grade with MinGW, MSYS and .NET, you will need
-    Visual C# compiler installed on your system.
-    The C# compiler (csc.exe) needs to be in the MSYS PATH, for example do the
+    Optional: To build the C# grade with MinGW, MSYS / MSYS2 and .NET, you will
+    need Visual C# compiler installed on your system.
+    The C# compiler (csc.exe) needs to be in your PATH, for example do the
      following in the shell:

          export PATH=/c/WINDOWS/Microsoft.NET/Framework/v4.0.30319/:$PATH

      See README.CSharp for further details.

-    Optional: To build the Erlang grade with MinGW and MSYS you will require
-    the Windows version of the Erlang/OTP distribution to be installed on
-    your system.  The Erlang compiler (erlc) and runtime (erl) needs to be in
-    the MSYS PATH, for example do the following in the shell:
+    Optional: To build the Erlang grade with MinGW and MSYS / MSYS2 you will
+    require the Windows version of the Erlang/OTP distribution to be installed
+    on your system.  The Erlang compiler (erlc) and runtime (erl) needs to be
+    in your PATH, for example do the following in the shell:

          export PATH=/c/Program\ Files/erl5.8.2/bin/:$PATH

@@ -97,22 +106,28 @@ To build the source distribution under MSYS follow these steps:
      It is important to specify the installation prefix as a full windows
      path with a drive letter (except use `/' instead of `\').
      Do not use a path like `/mercury', because that
-    will be interpreted differently by the MSYS shell than by the generated
-    executables, resulting in a broken installation. 
+    will be interpreted differently by the MSYS or MSYS2 shells than by the
+    generated executables, resulting in a broken installation.

-    If you are using the MSYS or MSYS2 shell with MinGW-w64 then you must also
-    invoke configure with the following option:
+    If you are using the MSYS (not the MSYS2) shell with MinGW-w64 then you
+    must also invoke configure with the following option:

         --host=x86_64-w64-mingw32

      This will cause mmake to use the MinGW-w64 tool chain.  Ensure that the
      MinGW-w64 tools are in your PATH before running configure.

+    If you are using the MSYS2 shell then you need to launch it in either
+    the "MSYS2 MinGW 32-bit" mode or the "MSYS2 MinGW 64-bit" mode to build
+    a 32- or 64-bit Mercury system respectively.  You do not need to pass the
+    --host option to configure script; it will detect the 32-bit or 64-bit
+    MSYS2 environment you are running in.
+
  5.  run: `make' and then `make install'.

-Add /c/mercury/bin (or whatever path you installed Mercury to) to the MSYS
-PATH (you cannot add `c:/mercury/bin' to the MSYS PATH because `:' is used to
-separate directories in the MSYS PATH).
+Add /c/mercury/bin (or whatever path you installed Mercury to) to the MSYS or
+MSY2 PATH (you cannot add `c:/mercury/bin' to the PATH because `:' is used
+to separate directories in the MSYS or MSYS2 PATH).

  NOTE TO DEVELOPERS: the tools/bootcheck script does not work properly
  on MSYS at the moment -- it will build stage 3, but will not run the tests

Julien.
Previous message: [m-rev.] for review: improve support for MSYS2 builds
Next message: [m-rev.] [www]: diff: announce 20.01 release
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the reviews mailing list