Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rust support on macOS #567

Merged
merged 4 commits into from
May 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/mediasoup-rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,17 @@ env:

jobs:
ci:
runs-on: ubuntu-20.04
strategy:
matrix:
os:
- ubuntu-20.04
- macos-10.15
rust:
- stable
# - nightly

runs-on: ${{ matrix.os }}

steps:
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -37,7 +41,7 @@ jobs:
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-cargo-${{ matrix.rust }}-${{ hashFiles('**/Cargo.toml') }}
key: ${{ matrix.os }}-cargo-${{ matrix.rust }}-${{ hashFiles('**/Cargo.toml') }}

- name: cargo fmt
uses: actions-rs/cargo@v1
Expand Down
5 changes: 1 addition & 4 deletions rust/src/worker/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,7 @@ fn pipe() -> [c_int; 2] {
let mut fds = mem::MaybeUninit::<[c_int; 2]>::uninit();

if libc::pipe(fds.as_mut_ptr().cast::<c_int>()) != 0 {
panic!(
"libc::pipe() failed with code {}",
*libc::__errno_location()
);
panic!("libc::pipe() failed: {:?}", std::io::Error::last_os_error());
}

fds.assume_init()
Expand Down
70 changes: 59 additions & 11 deletions worker/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,17 @@ fn main() {
return;
}

let current_dir = std::env::current_dir()
.unwrap()
.into_os_string()
.into_string()
.unwrap();
let out_dir = env::var("OUT_DIR").unwrap();

// Add C++ std lib
#[cfg(target_os = "linux")]
{
let path = Command::new(env::var("c++").unwrap_or_else(|_| "c++".to_string()))
let path = Command::new(env::var("CXX").unwrap_or_else(|_| "c++".to_string()))
ibc marked this conversation as resolved.
Show resolved Hide resolved
.arg("--print-file-name=libstdc++.a")
.output()
.expect("Failed to start")
Expand All @@ -31,7 +38,7 @@ fn main() {
target_os = "netbsd"
))]
{
let path = Command::new(env::var("c++").unwrap_or_else(|_| "c++".to_string()))
let path = Command::new(env::var("CXX").unwrap_or_else(|_| "c++".to_string()))
.arg("--print-file-name=libc++.a")
.output()
.expect("Failed to start")
Expand All @@ -47,22 +54,63 @@ fn main() {
}
#[cfg(target_os = "macos")]
{
panic!("Building on macOS is not currently supported");
// TODO: The issue here is `libc++.a` that is not shipped with macOS's `c++` it seems
let clang_llvm_version = "clang+llvm-12.0.0-x86_64-apple-darwin";
let status = Command::new("curl")
.args(&[
"-L",
"-s",
"-O",
&format!("https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.0/{}.tar.xz", clang_llvm_version),
])
.current_dir(&out_dir)
.status()
.expect("Failed to start");

if !status.success() {
panic!("Failed to download libc++");
}

let status = Command::new("tar")
.args(&[
"-xf",
&format!("{}.tar.xz", clang_llvm_version),
&format!("{}/lib/libc++.a", clang_llvm_version),
&format!("{}/lib/libc++abi.a", clang_llvm_version),
])
.current_dir(&out_dir)
.status()
.expect("Failed to start");
if !status.success() {
panic!("Failed to download libc++");
}

for file in &["libc++.a", "libc++abi.a"] {
std::fs::copy(
format!("{}/{}/lib/{}", out_dir, clang_llvm_version, file),
format!("{}/{}", out_dir, file),
)
.unwrap_or_else(|_| {
panic!(
"Failed to copy static library from {}/{}/lib/{} to {}/{}",
out_dir, clang_llvm_version, file, out_dir, file
)
});
}

std::fs::remove_file(format!("{}/{}.tar.xz", out_dir, clang_llvm_version))
.expect("Failed to remove downloaded clang+llvm archive");
std::fs::remove_dir_all(format!("{}/{}", out_dir, clang_llvm_version))
.expect("Failed to remove extracted clang+llvm files");

println!("cargo:rustc-link-lib=static=c++");
println!("cargo:rustc-link-lib=static=c++abi");
}
#[cfg(target_os = "windows")]
{
panic!("Building on Windows is not currently supported");
// TODO: Didn't bother, feel free to PR
}

let current_dir = std::env::current_dir()
.unwrap()
.into_os_string()
.into_string()
.unwrap();
let out_dir = env::var("OUT_DIR").unwrap();

// The build here is a bit awkward since we can't just specify custom target directory as
// openssl will fail to build with `make[1]: /bin/sh: Argument list too long` due to large
// number of files. So instead we build in place, copy files to out directory and then clean
Expand Down