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

Commit 4ce7edee authored by Sonny Sasaka's avatar Sonny Sasaka
Browse files

Floss: Fix build 

https://r.android.com/2058057 introduced linkage of btmanagerd with
btstack, which needs to be linked to libc++ instead of libstdc++ in
Chrome OS build.

Bug: 200732080
Tag: #floss
Test: Manual - build Floss on Chrome OS:
  USE=floss_upstream emerge-$BOARD floss

Change-Id: Ic9f0fdb70fcbd355738392cf5f1da5c267c41252
parent 7cba3954

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

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ fn main() { 
    let target_dir = std::env::var_os("CARGO_TARGET_DIR").unwrap();

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



    // Clang requires -lc++ instead of -lstdc++

    println!("cargo:rustc-link-lib=c++");



    // When cross-compiling, pkg-config is looking for dbus at the host libdir instead of the

    // sysroot. Adding this dependency here forces the linker to include the current sysroot's

    // libdir and fixes the build issues.