diff --git a/doc/src/history.adoc b/doc/src/history.adoc index 220d62757..1d40d2544 100644 --- a/doc/src/history.adoc +++ b/doc/src/history.adoc @@ -1,6 +1,11 @@ [[b2.history]] = History +== Version 5.5.3 + +* Fix regression when using ccache with clang-linux toolset. + -- _Alexander Grund_ + == Version 5.5.2 * Fix invalid use of system `ar` when cross-compiling with llvm on Linux instead diff --git a/src/build/version.jam b/src/build/version.jam index 9e6e0523b..9520b8ae3 100644 --- a/src/build/version.jam +++ b/src/build/version.jam @@ -10,7 +10,7 @@ import numbers ; # Mirror engine JAM_VERSION .major = 5 ; .minor = 5 ; -.patch = 2 ; +.patch = 3 ; rule build ( ) diff --git a/src/engine/patchlevel.h b/src/engine/patchlevel.h index c3a49532f..3a4636749 100644 --- a/src/engine/patchlevel.h +++ b/src/engine/patchlevel.h @@ -14,4 +14,4 @@ https://www.bfgroup.xyz/b2/LICENSE.txt) #define VERSION_MAJOR 5 #define VERSION_MINOR 5 -#define VERSION_PATCH 2 +#define VERSION_PATCH 3 diff --git a/src/tools/clang-linux.jam b/src/tools/clang-linux.jam index 95e8f8fe7..03f5546c2 100644 --- a/src/tools/clang-linux.jam +++ b/src/tools/clang-linux.jam @@ -110,7 +110,7 @@ rule init ( version ? : command * : options * ) { } if ! $(archiver) { - local bin = [ common.get-absolute-tool-path $(command) ] ; + local bin = [ common.get-absolute-tool-path $(command[-1]) ] ; archiver = [ common.get-invocation-command-nodefault clang-linux : llvm-ar : : $(bin) : search-path ] ; } toolset.flags clang-linux.archive .AR $(condition) : $(archiver[1]) ; diff --git a/test/toolset-mock/project-config.jam b/test/toolset-mock/project-config.jam index ded8d78bd..4d73ec241 100644 --- a/test/toolset-mock/project-config.jam +++ b/test/toolset-mock/project-config.jam @@ -27,6 +27,8 @@ using darwin : 4.2.1 : $(PYTHON) $(here)/src/darwin-4.2.1.py using clang-darwin : 3.9.0 : $(PYTHON) $(here)/src/clang-3.9.0-darwin.py : $(ar) ; using clang-linux : 3.9.0 : $(PYTHON) $(here)/src/clang-linux-3.9.0.py : $(ar) ; +# Let clang-linux auto-deduce the archiver +using clang-linux : 3.9.1 : $(PYTHON) $(here)/src/clang-linux-3.9.0.py ; using clang-vxworks : 4.0.1 : $(PYTHON) $(here)/src/clang-vxworks-4.0.1.py : $(ar) ; using intel-darwin : 10.2 : $(PYTHON) $(here)/src/intel-darwin-10.2.py : $(ar) ; diff --git a/test/toolset_clang_linux.py b/test/toolset_clang_linux.py index 1ff12336e..0f078a85e 100644 --- a/test/toolset_clang_linux.py +++ b/test/toolset_clang_linux.py @@ -27,3 +27,6 @@ test_toolset("clang-linux", "3.9.0", [ ["target-os=windows", "link=static"], ["target-os=windows", "architecture=x86", "address-model=32"] ]) + +# Auto-deduced ar +test_toolset("clang-linux", "3.9.1", [["target-os=linux"]])