Upstream B2 4.7.2

boostorg · Nov 19, 2021 · aaa95bb · aaa95bb
2 parents 3dd9a8f + 2e7e4fb
commit aaa95bb
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -11,7 +11,7 @@ freebsd_task:
     - { name: 'FreeBSD, GCC 10', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++10', PACKAGE: 'gcc10-devel' }, freebsd_instance: { image_family: 'freebsd-13-0' } }
     - { name: 'FreeBSD, GCC 9', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++9', PACKAGE: 'gcc9-devel' }, freebsd_instance: { image_family: 'freebsd-13-0' } }
     - { name: 'FreeBSD, GCC 8', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++8', PACKAGE: 'gcc8' }, freebsd_instance: { image_family: 'freebsd-13-0' } }
-    - { name: 'FreeBSD, GCC 7', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++7', PACKAGE: 'gcc7' }, freebsd_instance: { image_family: 'freebsd-13-0' } }
+    # - { name: 'FreeBSD, GCC 7', env: { TOOLSET: gcc, TEST_TOOLSET: gcc, CXX: 'g++7', PACKAGE: 'gcc7' }, freebsd_instance: { image_family: 'freebsd-13-0' } }
     - { name: 'FreeBSD, Clang 12', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++12', PACKAGE: 'devel/llvm12' }, freebsd_instance: { image_family: 'freebsd-13-0' } }
     - { name: 'FreeBSD, Clang 11', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++11', PACKAGE: 'devel/llvm11' }, freebsd_instance: { image_family: 'freebsd-13-0' } }
     - { name: 'FreeBSD, Clang 10', env: { TOOLSET: clang, TEST_TOOLSET: clang, CXX: 'clang++10', PACKAGE: 'devel/llvm10' }, freebsd_instance: { image_family: 'freebsd-13-0' } }

diff --git a/README.adoc b/README.adoc
@@ -15,12 +15,13 @@ file LICENSE.txt or copy at https://www.bfgroup.xyz/b2/LICENSE.txt)
 Continuously tested on:
 
 * FreeBSD Clang 7, 8, 9, 10, 11, 12
-* FreeBSD GCC 7, 8, 9, 10, 11
-* Linux Clang 4, 5, 6, 7, 8, 9, 10, 11, 12
+* FreeBSD GCC 8, 9, 10, 11
+* Linux Clang 4, 5, 6, 7, 8, 9, 10, 11, 12, 13
 * Linux GCC 5, 6, 7, 8, 9, 10, 11
 * macOS Xcode 10.0, 10.1, 10.2, 10.2.1, 11.2.1, 11.3, 11.3.1, 11.4.1, 11.5, 11.6, 11.7, 12.0.1, 12.1.1, 12.2, 12.3, 12.4, 12.5.1, 13.0
 * Windows MinGW 8.1.0
 * Windows VS 2013, 2015, 2017, 2019, 2022
+* Cygwin 3.1.7 x64
 
 image:https://img.shields.io/azure-devops/build/bfgroup/3a4e7a7e-c1b4-4e2f-9199-f52918ea06c6/3/release.svg?label=release&logo=azuredevops["Linux/Windows/macOS: release", link="https://dev.azure.com/bfgroup/B2"]
 image:https://img.shields.io/azure-devops/build/bfgroup/3a4e7a7e-c1b4-4e2f-9199-f52918ea06c6/3/main.svg?label=main&logo=azuredevops["Linux/Windows/macOS: main", link="https://dev.azure.com/bfgroup/B2"]

diff --git a/doc/src/history.adoc b/doc/src/history.adoc
@@ -1,6 +1,14 @@
 [[b2.history]]
 = History
 
+== Version 4.7.2
+
+* Fix errors configuring intel-linux toolset if icpx is not in the PATH but
+  icpc is in the PATH.
+  -- _Mark E. Hamilton_
+* Add `cxxstd=20` to msvc toolset now that VS 2019 onward supports it.
+  -- _Peter Dimov_
+
 == Version 4.7.1
 
 * Fix regression for linking with `clang-win` toolset.

diff --git a/src/engine/patchlevel.h b/src/engine/patchlevel.h
@@ -13,4 +13,4 @@ Distributed under the Boost Software License, Version 1.0.
 
 #define VERSION_MAJOR 4
 #define VERSION_MINOR 7
-#define VERSION_PATCH 1
+#define VERSION_PATCH 2
diff --git a/src/tools/intel-linux.jam b/src/tools/intel-linux.jam
@@ -93,23 +93,32 @@ rule init ( version ? :  command * : options * )
         {
             local bin_paths = $(.bin(oneAPI)) ;
             detected_command = [ common.find-tool icpx : $(bin_paths) ] ;
-            command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ;
-            command_lib_path = $(command_abs_path)/../compiler/lib/intel64 ;
+            if $(detected_command)
+            {
+                command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ;
+                command_lib_path = $(command_abs_path)/../compiler/lib/intel64 ;
+            }
         }
         if ! $(detected_command)
         {
             local bin_paths = $(.bin(12.0)) $(.bin(11.1)) $(.bin(11.0)) ;
             detected_command = [ common.find-tool icpc : $(bin_paths) ] ;
-            command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ;
-            command_lib_path = $(command_abs_path)/../lib/x86_64 ;
+            if $(detected_command)
+            {
+                command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ;
+                command_lib_path = $(command_abs_path)/../lib/x86_64 ;
+            }
         }
         if ! $(detected_command)
         {
             local bin_paths = $(.bin(10.1)) $(.bin(9.1)) $(.bin(9.0))
                 $(.bin(8.1)) $(.bin(8.0)) ;
             detected_command = [ common.find-tool icpc : $(bin_paths) ] ;
-            command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ;
-            command_lib_path = $(command_abs_path)/../lib ;
+            if $(detected_command)
+            {
+                command_abs_path = [ common.get-absolute-tool-path $(detected_command) ] ;
+                command_lib_path = $(command_abs_path)/../lib ;
+            }
         }
         if $(detected_command)
         {

diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam
@@ -1942,6 +1942,7 @@ local rule register-toolset-really ( )
 
     toolset.flags msvc.compile C++FLAGS  <cxxstd>14 : "/std:c++14" ;
     toolset.flags msvc.compile C++FLAGS  <cxxstd>17 : "/std:c++17" ;
+    toolset.flags msvc.compile C++FLAGS  <cxxstd>20 : "/std:c++20" ;
     toolset.flags msvc.compile C++FLAGS  <cxxstd>latest : "/std:c++latest" ;
 
     # By default 8.0 enables rtti support while prior versions disabled it. We