Skip to content

Commit f397838

Browse files
authored
Pass through the new Rust and Go version arguments (#1358)
* Pass through the new Rust and Go version arguments * Add version selection to the docs * Version bump and update BinaryBuilderBase compat (BinaryBuilderBase.jl 1.34 has the new kwargs.)
1 parent 44b5ef7 commit f397838

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Project.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "BinaryBuilder"
22
uuid = "12aac903-9f7c-5d81-afc2-d9565ea332ae"
33
authors = ["Elliot Saba <[email protected]>"]
4-
version = "0.6.2"
4+
version = "0.6.3"
55

66
[deps]
77
ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"
@@ -33,7 +33,7 @@ ghr_jll = "07c12ed4-43bc-5495-8a2a-d5838ef8d533"
3333

3434
[compat]
3535
ArgParse = "1.1"
36-
BinaryBuilderBase = "1.33"
36+
BinaryBuilderBase = "1.34"
3737
Downloads = "1"
3838
GitHub = "5.1"
3939
HTTP = "0.8, 0.9, 1"

docs/src/build_tips.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Examples of builds performed with Meson include:
9595

9696
## Go builds
9797

98-
The Go toolchain provided by BinaryBuilder can be requested by adding `:go` to the `compilers` keyword argument to [`build_tarballs`](@ref): `compilers=[:c, :go]`. Go-based packages can usually be built and installed with `go`:
98+
The Go toolchain provided by BinaryBuilder can be requested by adding `:go` to the `compilers` keyword argument to [`build_tarballs`](@ref): `compilers=[:c, :go]`, and a specific version of the toolchain can be selected by adding the `preferred_go_version` keyword argument to [`build_tarballs`](@ref). Go-based packages can usually be built and installed with `go`:
9999

100100
```sh
101101
go build -o ${bindir}
@@ -109,7 +109,7 @@ Example of packages using Go:
109109

110110
## Rust builds
111111

112-
The Rust toolchain provided by BinaryBuilder can be requested by adding `:rust` to the `compilers` keyword argument to [`build_tarballs`](@ref): `compilers=[:c, :rust]`. Rust-based packages can usually be built with `cargo`:
112+
The Rust toolchain provided by BinaryBuilder can be requested by adding `:rust` to the `compilers` keyword argument to [`build_tarballs`](@ref): `compilers=[:c, :rust]`, and a specific version of the toolchain can be selected by adding the `preferred_rust_version` keyword argument to [`build_tarballs`](@ref). Rust-based packages can usually be built with `cargo`:
113113

114114
```sh
115115
cargo build --release
@@ -212,7 +212,7 @@ If in your build you need to use a package to a BLAS/LAPACK library you have the
212212
* always use LP64 interface, also on 64-bit systems.
213213
This may be a simpler option if renamining the BLAS/LAPACK symbols is too cumbersome in your case.
214214
In terms of libraries to link to:
215-
- also in this case you can link to `libblastrampoline`, however you _must_ make sure an LP64 BLAS/LAPACK library is backing `libblastrampoline`, otherwise all BLAS/LAPACK calls from the library will result in hard-to-debug segmentation faults, because in this case Julia does not provided a default backing LP64 BLAS/LAPACK library on 64-bit systems
215+
- also in this case you can link to `libblastrampoline`, however you _must_ make sure an LP64 BLAS/LAPACK library is backing `libblastrampoline`, otherwise all BLAS/LAPACK calls from the library will result in hard-to-debug segmentation faults, because in this case Julia does not provided a default backing LP64 BLAS/LAPACK library on 64-bit systems
216216
- alternatively, you can use builds of BLAS/LAPACK libraries which always use LP64 interface also on 64-bit platforms, like the package `OpenBLAS32_jll`.
217217

218218
## Dependencies for the target system vs host system

src/AutoBuild.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -819,7 +819,7 @@ function autobuild(dir::AbstractString,
819819
build_path = joinpath(dir, "build", triplet(platform))
820820
mkpath(build_path)
821821

822-
shards = choose_shards(platform; extract_kwargs(kwargs, (:preferred_gcc_version,:preferred_llvm_version,:bootstrap_list,:compilers))...)
822+
shards = choose_shards(platform; extract_kwargs(kwargs, (:preferred_gcc_version,:preferred_llvm_version,:preferred_rust_version,:preferred_go_version,:bootstrap_list,:compilers))...)
823823
concrete_platform = get_concrete_platform(platform, shards)
824824

825825
prefix = setup_workspace(

0 commit comments

Comments
 (0)