aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--README.md2
-rw-r--r--README.mingw.md (renamed from README.windows)4
-rw-r--r--m4/check-os-options.m42
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 2edef0d..3f62cd9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ if !ENABLE_LIBTLS_ONLY
10pkgconfig_DATA += libcrypto.pc libssl.pc openssl.pc 10pkgconfig_DATA += libcrypto.pc libssl.pc openssl.pc
11endif 11endif
12 12
13EXTRA_DIST = README.md README.windows VERSION config scripts 13EXTRA_DIST = README.md README.mingw.md VERSION config scripts
14EXTRA_DIST += CMakeLists.txt cmake_export_symbol.cmake cmake_uninstall.cmake.in FindLibreSSL.cmake LibreSSLConfig.cmake.in 14EXTRA_DIST += CMakeLists.txt cmake_export_symbol.cmake cmake_uninstall.cmake.in FindLibreSSL.cmake LibreSSLConfig.cmake.in
15EXTRA_DIST += cert.pem openssl.cnf x509v3.cnf 15EXTRA_DIST += cert.pem openssl.cnf x509v3.cnf
16 16
diff --git a/README.md b/README.md
index ab159ab..9c07175 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,7 @@ make
134 134
135LibreSSL builds against relatively recent versions of Mingw-w64, not to be 135LibreSSL builds against relatively recent versions of Mingw-w64, not to be
136confused with the original mingw.org project. Mingw-w64 3.2 or later 136confused with the original mingw.org project. Mingw-w64 3.2 or later
137should work. See README.windows for more information 137should work. See README.mingw.md for more information.
138 138
139#### Windows - Visual Studio 139#### Windows - Visual Studio
140 140
diff --git a/README.windows b/README.mingw.md
index 2d342fa..7c567bc 100644
--- a/README.windows
+++ b/README.mingw.md
@@ -1,4 +1,4 @@
1# Building 1## Building with mingw-w64 for 32- and 64-bit
2 2
3For Windows systems, LibreSSL supports the mingw-w64 toolchain, which can use 3For Windows systems, LibreSSL supports the mingw-w64 toolchain, which can use
4GCC or Clang as the compiler. Contrary to its name, mingw-w64 supports both 4GCC or Clang as the compiler. Contrary to its name, mingw-w64 supports both
@@ -23,7 +23,7 @@ For 64-bit builds, use these instead:
23 make 23 make
24 make check 24 make check
25 25
26# Why the -D__MINGW_USE_VC2005_COMPAT flag on 32-bit systems? 26### Why the -D__MINGW_USE_VC2005_COMPAT flag on 32-bit systems?
27 27
28An ABI change introduced with Microsoft Visual C++ 2005 (also known as 28An ABI change introduced with Microsoft Visual C++ 2005 (also known as
29Visual C++ 8.0) switched time_t from 32-bit to 64-bit. It is important to 29Visual C++ 8.0) switched time_t from 32-bit to 64-bit. It is important to
diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4
index 77edd14..3775b79 100644
--- a/m4/check-os-options.m4
+++ b/m4/check-os-options.m4
@@ -145,7 +145,7 @@ if test "$ac_cv_sizeof_time_t" = "4"; then
145 if test "$host_os" = "mingw32" ; then 145 if test "$host_os" = "mingw32" ; then
146 echo " **" 146 echo " **"
147 echo " ** You can solve this by adjusting the build flags in your" 147 echo " ** You can solve this by adjusting the build flags in your"
148 echo " ** mingw-w64 toolchain. Refer to README.windows for details." 148 echo " ** mingw-w64 toolchain. Refer to README.mingw.md for details."
149 fi 149 fi
150fi 150fi
151 151