update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / tools / build / src / engine / config_toolset.bat

diff --git a/ceph/src/boost/tools/build/src/engine/config_toolset.bat b/ceph/src/boost/tools/build/src/engine/config_toolset.bat
index c89342e17f8e26b599f275da41eadf10f6782f27..48ccd3aafed6c7943d5f2f6ccad5b4ad02de90c1 100644 (file)
--- a/ceph/src/boost/tools/build/src/engine/config_toolset.bat
+++ b/ceph/src/boost/tools/build/src/engine/config_toolset.bat
@@ -11,9 +11,11 @@ if "_%B2_TOOLSET%_" == "_vc12_" call :Config_VC12
 if "_%B2_TOOLSET%_" == "_vc14_" call :Config_VC14\r
 if "_%B2_TOOLSET%_" == "_vc141_" call :Config_VC141\r
 if "_%B2_TOOLSET%_" == "_vc142_" call :Config_VC142\r
+if "_%B2_TOOLSET%_" == "_vc143_" call :Config_VC143\r
 if "_%B2_TOOLSET%_" == "_borland_" call :Config_BORLAND\r
 if "_%B2_TOOLSET%_" == "_como_" call :Config_COMO\r
 if "_%B2_TOOLSET%_" == "_gcc_" call :Config_GCC\r
+if "_%B2_TOOLSET%_" == "_clang_" call :Config_CLANG\r
 if "_%B2_TOOLSET%_" == "_gcc-nocygwin_" call :Config_GCC_NOCYGWIN\r
 if "_%B2_TOOLSET%_" == "_intel-win32_" call :Config_INTEL_WIN32\r
 if "_%B2_TOOLSET%_" == "_mingw_" call :Config_MINGW\r
@@ -33,7 +35,7 @@ call :Call_If_Exists "%B2_TOOLSET_ROOT%bin\VCVARS32.BAT"
 if not "_%B2_TOOLSET_ROOT%_" == "__" (\r
     set "PATH=%B2_TOOLSET_ROOT%bin;%PATH%"\r
     )\r
-set "B2_CXX=%CXX% /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL"\r
+set "B2_CXX="%CXX%" /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL /EHsc"\r
 set "B2_CXX_LINK=/link kernel32.lib advapi32.lib user32.lib"\r
 set "_known_=1"\r
 goto :eof\r
@@ -48,7 +50,7 @@ if NOT "_%B2_TOOLSET_ROOT%_" == "__" (
     if "_%VCINSTALLDIR%_" == "__" (\r
         set "PATH=%B2_TOOLSET_ROOT%bin;%PATH%"\r
         ) )\r
-set "B2_CXX=%CXX% /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL"\r
+set "B2_CXX="%CXX%" /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL /EHsc"\r
 set "B2_CXX_LINK=/link kernel32.lib advapi32.lib user32.lib"\r
 set "_known_=1"\r
 goto :eof\r
@@ -67,7 +69,7 @@ if NOT "_%B2_TOOLSET_ROOT%_" == "__" (
     if "_%VCINSTALLDIR%_" == "__" (\r
         set "PATH=%B2_TOOLSET_ROOT%bin;%PATH%"\r
         ) )\r
-set "B2_CXX=%CXX% /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL"\r
+set "B2_CXX="%CXX%" /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL /EHsc"\r
 set "B2_CXX_LINK=/link kernel32.lib advapi32.lib user32.lib"\r
 set "_known_=1"\r
 goto :eof\r
@@ -87,7 +89,7 @@ if NOT "_%B2_TOOLSET_ROOT%_" == "__" (
     if "_%VCINSTALLDIR%_" == "__" (\r
         set "PATH=%B2_TOOLSET_ROOT%bin;%PATH%"\r
         ) )\r
-set "B2_CXX=%CXX% /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL"\r
+set "B2_CXX="%CXX%" /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL /EHsc"\r
 set "B2_CXX_LINK=/link kernel32.lib advapi32.lib user32.lib"\r
 set "_known_=1"\r
 goto :eof\r
@@ -109,7 +111,7 @@ REM return to current directory as vsdevcmd_end.bat switches to %USERPROFILE%\So
 pushd %CD%\r
 if "_%VSINSTALLDIR%_" == "__" call :Call_If_Exists "%B2_TOOLSET_ROOT%Auxiliary\Build\vcvarsall.bat" %B2_BUILD_ARGS%\r
 popd\r
-set "B2_CXX=%CXX% /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL"\r
+set "B2_CXX="%CXX%" /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL /EHsc"\r
 set "B2_CXX_LINK=/link kernel32.lib advapi32.lib user32.lib"\r
 set "_known_=1"\r
 goto :eof\r
@@ -131,7 +133,29 @@ REM return to current directory as vsdevcmd_end.bat switches to %USERPROFILE%\So
 pushd %CD%\r
 if "_%VSINSTALLDIR%_" == "__" call :Call_If_Exists "%B2_TOOLSET_ROOT%Auxiliary\Build\vcvarsall.bat" %B2_BUILD_ARGS%\r
 popd\r
-set "B2_CXX=%CXX% /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL"\r
+set "B2_CXX="%CXX%" /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL /EHsc"\r
+set "B2_CXX_LINK=/link kernel32.lib advapi32.lib user32.lib"\r
+set "_known_=1"\r
+goto :eof\r
+\r
+:Config_VC143\r
+if not defined CXX ( set "CXX=cl" )\r
+call vswhere_usability_wrapper.cmd\r
+REM Reset ERRORLEVEL since from now on it's all based on ENV vars\r
+ver > nul 2> nul\r
+if "_%B2_TOOLSET_ROOT%_" == "__" (\r
+    if NOT "_%VS170COMNTOOLS%_" == "__" (\r
+        set "B2_TOOLSET_ROOT=%VS170COMNTOOLS%..\..\VC\"\r
+    ))\r
+\r
+if "_%B2_ARCH%_" == "__" set B2_ARCH=%PROCESSOR_ARCHITECTURE%\r
+set B2_BUILD_ARGS=%B2_BUILD_ARGS% %B2_ARCH%\r
+\r
+REM return to current directory as vsdevcmd_end.bat switches to %USERPROFILE%\Source if it exists.\r
+pushd %CD%\r
+if "_%VSINSTALLDIR%_" == "__" call :Call_If_Exists "%B2_TOOLSET_ROOT%Auxiliary\Build\vcvarsall.bat" %B2_BUILD_ARGS%\r
+popd\r
+set "B2_CXX="%CXX%" /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL /EHsc"\r
 set "B2_CXX_LINK=/link kernel32.lib advapi32.lib user32.lib"\r
 set "_known_=1"\r
 goto :eof\r
@@ -153,15 +177,15 @@ REM return to current directory as vsdevcmd_end.bat switches to %USERPROFILE%\So
 pushd %CD%\r
 if "_%VSINSTALLDIR%_" == "__" call :Call_If_Exists "%B2_TOOLSET_ROOT%Auxiliary\Build\vcvarsall.bat" %B2_BUILD_ARGS%\r
 popd\r
-set "B2_CXX=%CXX% /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL"\r
+set "B2_CXX="%CXX%" /nologo /MP /MT /TP /Feb2 /wd4996 /O2 /GL /EHsc"\r
 set "B2_CXX_LINK=/link kernel32.lib advapi32.lib user32.lib"\r
 set "_known_=1"\r
 goto :eof\r
 \r
 :Config_BORLAND\r
-if not defined CXX ( set "CXX=bcc32" )\r
+if not defined CXX ( set "CXX=bcc32c" )\r
 if "_%B2_TOOLSET_ROOT%_" == "__" (\r
-    call guess_toolset.bat test_path bcc32.exe )\r
+    call guess_toolset.bat test_path bcc32c.exe )\r
 if "_%B2_TOOLSET_ROOT%_" == "__" (\r
     if not errorlevel 1 (\r
         set "B2_TOOLSET_ROOT=%FOUND_PATH%..\"\r
@@ -169,31 +193,37 @@ if "_%B2_TOOLSET_ROOT%_" == "__" (
 if not "_%B2_TOOLSET_ROOT%_" == "__" (\r
     set "PATH=%B2_TOOLSET_ROOT%Bin;%PATH%"\r
     )\r
-set "B2_CXX=%CXX% -tC -P -O2 -w- -I"%B2_TOOLSET_ROOT%Include" -L"%B2_TOOLSET_ROOT%Lib" -Nd -eb2"\r
+set "B2_CXX="%CXX%" -tC -P -O2 -w- -I"%B2_TOOLSET_ROOT%Include" -L"%B2_TOOLSET_ROOT%Lib" -eb2"\r
 set "_known_=1"\r
 goto :eof\r
 \r
 :Config_COMO\r
 if not defined CXX ( set "CXX=como" )\r
-set "B2_CXX=%CXX% --inlining -o b2.exe"\r
+set "B2_CXX="%CXX%" --inlining -o b2.exe"\r
 set "_known_=1"\r
 goto :eof\r
 \r
 :Config_GCC\r
 if not defined CXX ( set "CXX=g++" )\r
-set "B2_CXX=%CXX% -x c++ -std=c++11 -s -O3 -o b2.exe"\r
+set "B2_CXX="%CXX%" -x c++ -std=c++11 -s -O3 -o b2.exe -D_GNU_SOURCE"\r
+set "_known_=1"\r
+goto :eof\r
+\r
+:Config_CLANG\r
+if not defined CXX ( set "CXX=clang++" )\r
+set "B2_CXX="%CXX%" -x c++ -std=c++11 -s -O3 -o b2.exe"\r
 set "_known_=1"\r
 goto :eof\r
 \r
 :Config_GCC_NOCYGWIN\r
 if not defined CXX ( set "CXX=g++" )\r
-set "B2_CXX=%CXX% -x c++ -std=c++11 -s -O3 -mno-cygwin -o b2.exe"\r
+set "B2_CXX="%CXX%" -x c++ -std=c++11 -s -O3 -mno-cygwin -o b2.exe"\r
 set "_known_=1"\r
 goto :eof\r
 \r
 :Config_INTEL_WIN32\r
 if not defined CXX ( set "CXX=icl" )\r
-set "B2_CXX=%CXX% /nologo /MT /O2 /Ob2 /Gy /GF /GA /GB /Feb2"\r
+set "B2_CXX="%CXX%" /nologo /MT /O2 /Ob2 /Gy /GF /GA /GB /Feb2"\r
 set "_known_=1"\r
 goto :eof\r
 \r
@@ -203,6 +233,6 @@ if not "_%B2_TOOLSET_ROOT%_" == "__" (
     set "PATH=%B2_TOOLSET_ROOT%bin;%PATH%"\r
     )\r
 for /F "delims=" %%I in ("%CXX%") do set "PATH=%PATH%;%%~dpI"\r
-set "B2_CXX=%CXX% -x c++ -std=c++11 -s -O3 -o b2.exe"\r
+set "B2_CXX="%CXX%" -x c++ -std=c++11 -s -O3 -o b2.exe"\r
 set "_known_=1"\r
 goto :eof\r