diff --git a/doc/src/history.adoc b/doc/src/history.adoc index 5165212850..55105b0f84 100644 --- 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 index 0e2e948443..1dbead0dee 100644 --- 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 index f3301831ec..826f06bdac 100644 --- 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 ;