Skip to content

Commit a603f90

Browse files
authored
Re-generate libsamply-mac-preload binaries for arm64e support (#663)
Follow-up to #659.
2 parents 46b4a8c + d145610 commit a603f90

File tree

8 files changed

+3
-15
lines changed

8 files changed

+3
-15
lines changed

samply-mac-preload/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
99
# This crate is not part of the samply workspace.
1010

1111
[lib]
12-
crate_type = ["cdylib"]
12+
crate-type = ["cdylib"]
1313

1414
[profile.dev]
1515
panic = "abort"
30.4 KB
Binary file not shown.
-1.4 KB
Binary file not shown.
51.5 KB
Binary file not shown.
-21.4 KB
Binary file not shown.

samply-mac-preload/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
export SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
2-
MACOSX_DEPLOYMENT_TARGET=10.7 cargo build --release --target=x86_64-apple-darwin
2+
MACOSX_DEPLOYMENT_TARGET=10.12 cargo build --release --target=x86_64-apple-darwin
33
mv target/x86_64-apple-darwin/release/libsamply_mac_preload.dylib binaries/libsamply_mac_preload_x86_64.dylib
44
MACOSX_DEPLOYMENT_TARGET=11.0 cargo build --release --target=aarch64-apple-darwin
55
mv target/aarch64-apple-darwin/release/libsamply_mac_preload.dylib binaries/libsamply_mac_preload_arm64.dylib
6-
MACOSX_DEPLOYMENT_TARGET=11.0 RUSTC_BOOTSTRAP=1 cargo build --release --target=arm64e-apple-darwin -Zbuild-std
6+
MACOSX_DEPLOYMENT_TARGET=11.0 RUSTC_BOOTSTRAP=1 cargo build --release --target=arm64e-apple-darwin -Zbuild-std=core
77
mv target/arm64e-apple-darwin/release/libsamply_mac_preload.dylib binaries/libsamply_mac_preload_arm64e.dylib
88
lipo binaries/libsamply_mac_preload_* -create -output binaries/libsamply_mac_preload.dylib
99
gzip -cvf binaries/libsamply_mac_preload.dylib > ../samply/resources/libsamply_mac_preload.dylib.gz

samply-mac-preload/src/mach_ipc.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -441,18 +441,6 @@ impl OsIpcChannel {
441441
}
442442
}
443443

444-
#[derive(PartialEq, Eq, Debug)]
445-
pub struct OsOpaqueIpcChannel {
446-
port: mach_port_t,
447-
}
448-
449-
impl Drop for OsOpaqueIpcChannel {
450-
fn drop(&mut self) {
451-
// Make sure we don't leak!
452-
debug_assert!(self.port == MACH_PORT_NULL);
453-
}
454-
}
455-
456444
unsafe fn setup_receive_buffer(buffer: &mut [u8], port_name: mach_port_t) {
457445
let message = &buffer[0] as *const u8 as *mut mach_msg_header_t;
458446
(*message).msgh_local_port = port_name;
3.45 KB
Binary file not shown.

0 commit comments

Comments
 (0)