aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-05-03 14:27:57 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-05-03 14:27:57 +0200
commit29422008cee820069db67d4e02fb2bafae70cbb1 (patch)
tree59b037d2d9daff4d9cd61a1981c39defd4b8f703
parent2ac4f45a0bb4b02eb8fe13b96d4afc5cd7154f26 (diff)
Update INSTALL
-rw-r--r--BOOTSTRAP-UNIX.cli2
-rw-r--r--BOOTSTRAP-WINDOWS.cli14
-rw-r--r--INSTALL.cli4
3 files changed, 13 insertions, 7 deletions
diff --git a/BOOTSTRAP-UNIX.cli b/BOOTSTRAP-UNIX.cli
index 9989284..9923316 100644
--- a/BOOTSTRAP-UNIX.cli
+++ b/BOOTSTRAP-UNIX.cli
@@ -53,7 +53,7 @@ $ sha256 -r build2-toolchain-X.Y.Z.tar.xz
Unpack the archive and change to its directory:
\
-> tar xf build2-toolchain-X.Y.Z.tar.xz
+> tar -xf build2-toolchain-X.Y.Z.tar.xz
> cd build2-toolchain-X.Y.Z
\
diff --git a/BOOTSTRAP-WINDOWS.cli b/BOOTSTRAP-WINDOWS.cli
index 7b3bf3c..7e0db13 100644
--- a/BOOTSTRAP-WINDOWS.cli
+++ b/BOOTSTRAP-WINDOWS.cli
@@ -20,8 +20,8 @@ The \c{build2} toolchain on Windows requires a set of extra utilities
Normally, the \c{build2} toolchain itself is installed into the same directory
as the utilities in order to produce the combined installation.
-To build on Windows you will need either MSVC 14 Update 2 or later or MinGW
-GCC 4.8 or later. Note also that MinGW GCC must be configured with the
+To build on Windows you will need either MSVC 14 Update 3 or later or MinGW
+GCC 4.9 or later. Note also that MinGW GCC must be configured with the
\c{posix} threading model (this is currently the only configuration that
implements C++11 threads; run \c{g++ -v} to verify).
@@ -30,6 +30,10 @@ If you don't already have a suitable C++ compiler, then you can use the
(see the \c{README} file inside for details). If used, then it should be
unpacked into the same directory as \c{build2-baseutils}.
+Note also that it is strongly recommended that you use 64-bit (x86_64)
+versions of the \c{baseutils} and \c{mingw} packages if running 64-bit
+Windows.
+
To bootstrap on Windows with either MSVC or MinGW start with the following
common steps:
@@ -109,7 +113,8 @@ If required, unpack the \c{build2-mingw-X.Y.Z-<arch>-windows.tar.xz} archive
into \c{C:\\build2\\}:
\
-> tar xf build2-mingw-X.Y.Z-<arch>-windows.tar.xz ^
+> xz -d build2-mingw-X.Y.Z-<arch>-windows.tar.xz
+> tar -xf build2-mingw-X.Y.Z-<arch>-windows.tar ^
--one-top-level=C:\build2 --strip-components=1
\
@@ -128,7 +133,8 @@ Unpack the \c{build2-toolchain-X.Y.Z.tar.xz} archive and change to its
directory:
\
-> tar xf build2-toolchain-X.Y.Z.tar.xz
+> xz -d build2-toolchain-X.Y.Z.tar.xz
+> tar -xf build2-toolchain-X.Y.Z.tar
> cd build2-toolchain-X.Y.Z
\
diff --git a/INSTALL.cli b/INSTALL.cli
index c62a3b5..e0785bf 100644
--- a/INSTALL.cli
+++ b/INSTALL.cli
@@ -25,10 +25,10 @@ the UNIX version of the commands. In this case making a Windows version is
a simple matter of adjusting paths and, if used, line continuations.
The \c{build2} toolchain requires a C++14 compiler. From the commonly-used
-options, GCC 4.8, Clang 3.4, and MSVC 2015/14 Update 2 or any later versions
+options, GCC 4.9, Clang 3.4, and MSVC 14 (2015) Update 3 or any later versions
of these compilers should work. Note also that the C++ compiler that you use
to build the \c{build2} toolchain and the one that you will use to build your
-projects need not be the same. For example, if you are using MSVC 2013/12
+projects need not be the same. For example, if you are using MSVC 12 (2013)
(which cannot build \c{build2}), it is perfectly fine to get a minimal MinGW
toolchain and use that to build \c{build2}; you will still be able to use MSVC
to build your own code.