mirror of
https://github.com/boostorg/build.git
synced 2026-07-21 13:13:39 +00:00
Merge remote-tracking branch 'bfgroup.b2/release' into develop
This commit is contained in:
@@ -1,6 +1,11 @@
|
|||||||
[[b2.history]]
|
[[b2.history]]
|
||||||
= History
|
= History
|
||||||
|
|
||||||
|
== Version 5.5.3
|
||||||
|
|
||||||
|
* Fix regression when using ccache with clang-linux toolset.
|
||||||
|
-- _Alexander Grund_
|
||||||
|
|
||||||
== Version 5.5.2
|
== Version 5.5.2
|
||||||
|
|
||||||
* Fix invalid use of system `ar` when cross-compiling with llvm on Linux instead
|
* Fix invalid use of system `ar` when cross-compiling with llvm on Linux instead
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import numbers ;
|
|||||||
# Mirror engine JAM_VERSION
|
# Mirror engine JAM_VERSION
|
||||||
.major = 5 ;
|
.major = 5 ;
|
||||||
.minor = 5 ;
|
.minor = 5 ;
|
||||||
.patch = 2 ;
|
.patch = 3 ;
|
||||||
|
|
||||||
|
|
||||||
rule build ( )
|
rule build ( )
|
||||||
|
|||||||
@@ -14,4 +14,4 @@ https://www.bfgroup.xyz/b2/LICENSE.txt)
|
|||||||
|
|
||||||
#define VERSION_MAJOR 5
|
#define VERSION_MAJOR 5
|
||||||
#define VERSION_MINOR 5
|
#define VERSION_MINOR 5
|
||||||
#define VERSION_PATCH 2
|
#define VERSION_PATCH 3
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ rule init ( version ? : command * : options * ) {
|
|||||||
}
|
}
|
||||||
if ! $(archiver)
|
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 ] ;
|
archiver = [ common.get-invocation-command-nodefault clang-linux : llvm-ar : : $(bin) : search-path ] ;
|
||||||
}
|
}
|
||||||
toolset.flags clang-linux.archive .AR $(condition) : $(archiver[1]) ;
|
toolset.flags clang-linux.archive .AR $(condition) : $(archiver[1]) ;
|
||||||
|
|||||||
@@ -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-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) ;
|
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 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) ;
|
using intel-darwin : 10.2 : $(PYTHON) $(here)/src/intel-darwin-10.2.py : $(ar) ;
|
||||||
|
|
||||||
|
|||||||
@@ -27,3 +27,6 @@ test_toolset("clang-linux", "3.9.0", [
|
|||||||
["target-os=windows", "link=static"],
|
["target-os=windows", "link=static"],
|
||||||
["target-os=windows", "architecture=x86", "address-model=32"]
|
["target-os=windows", "architecture=x86", "address-model=32"]
|
||||||
])
|
])
|
||||||
|
|
||||||
|
# Auto-deduced ar
|
||||||
|
test_toolset("clang-linux", "3.9.1", [["target-os=linux"]])
|
||||||
|
|||||||
Reference in New Issue
Block a user