Fix regression for linking with clang-win toolset.

fixes boostorg/build#741 fixes #98
bfgroup · Oct 9, 2021 · 84ed4e1 · 84ed4e1
1 parent e161f17
commit 84ed4e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/doc/src/history.adoc b/doc/src/history.adoc
@@ -1,6 +1,11 @@
 [[b2.history]]
 = History
 
+== Version 4.7.1
+
+* Fix regression for linking with `clang-win` toolset.
+  -- _Peter Dimov_
+
 == Version 4.7.0
 
 Many, many fixes and internal cleanups in this release. But also adding

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 0
+#define VERSION_PATCH 1
diff --git a/src/tools/clang-win.jam b/src/tools/clang-win.jam
@@ -217,9 +217,9 @@ rule init ( version ? : command * : options * )
             }
 
             toolset.flags clang-win.compile .CC $(cond) : $(compiler) --target=$(clang-arch)-pc-windows-msvc ;
-            toolset.flags clang-win.link .LD $(cond) : $(linker) /nologo "/machine:$(linker-arch)" ;
-            toolset.flags clang-win.link LINKOPT $(cond) : ;
-            toolset.flags clang-win.link LINKFLAGS $(cond) : "/incremental:no" "/manifest" ;
+            toolset.flags clang-win.link .LD $(cond) : $(compiler) --target=$(clang-arch)-pc-windows-msvc ;
+            toolset.flags clang-win.link LINKOPT $(cond) : /link ;
+            toolset.flags clang-win.link LINKFLAGS $(cond) : "/incremental:no" "/manifest" "/machine:$(linker-arch)" ;
             if $(arch) = x86
             {
                 toolset.flags clang-win.compile .ASM $(cond) : $(assembler) -nologo -c -Zp4 -Cp -Cx ;