Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 155367fd authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Icaedef0a,I382960c0 

* changes:
  floss: Uprev docker container rustc + cxx versions
  floss: Link bluetooth-static as whole archive
parents ce670abd fa07fc0c

floss/build/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -59,13 +59,13 @@ RUN apt-get update && \ 
# Next install the Rust toolchain. Download the toolchain to the local folder

# using curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs

ADD rustup/rustup.sh /tmp

RUN /tmp/rustup.sh -y --default-toolchain 1.60.0

RUN /tmp/rustup.sh -y --default-toolchain 1.68.2



# Add .cargo/bin to $PATH

ENV PATH="/root/.cargo/bin:${PATH}"



# Install cargo packages required on build image.

RUN cargo install cxxbridge-cmd --version 1.0.42

RUN cargo install cxxbridge-cmd --version 1.0.94



# Rename llvm packages. By default, they are named 11vm-ar-13, etc. which won't

# work properly with the build.

system/gd/rust/linux/service/build.rs

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ fn main() { 
    // The main linking point with c++ code is the libbluetooth-static.a

    // These includes all the symbols built via C++ but doesn't include other

    // links (i.e. pkg-config)

    println!("cargo:rustc-link-lib=static=bluetooth-static");

    println!("cargo:rustc-link-lib=static:-bundle,+whole-archive=bluetooth-static");

    println!("cargo:rustc-link-search=native={}", target_dir.clone().into_string().unwrap());

    // Also re-run the build if anything in the C++ build changes

    println!("cargo:rerun-if-changed={}", cxx_outdir.into_string().unwrap());