Skip to content

Commit

Permalink
Revert "disable powerpc for pixi global as we can't compile a musl ta…
Browse files Browse the repository at this point in the history
…rget for it and the gnu version is not guaranteed to work."

This reverts commit b47ee5c.
  • Loading branch information
ruben-arts committed Dec 5, 2024
1 parent b47ee5c commit 2434827
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/trampoline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
target: aarch64-unknown-linux-musl
os: ubuntu-latest

- name: "Linux-powerpc64le"
target: powerpc64le-unknown-linux-gnu
os: ubuntu-latest

- name: "macOS-x86"
target: x86_64-apple-darwin
os: macos-13
Expand Down
Binary file not shown.
14 changes: 7 additions & 7 deletions src/global/trampoline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ const TRAMPOLINE_BIN: &[u8] = include_bytes!(
"../../crates/pixi_trampoline/trampolines/pixi-trampoline-x86_64-pc-windows-msvc.exe.zst"
);

#[cfg(target_arch = "powerpc64")]
#[cfg(target_endian = "little")]
#[cfg(target_os = "linux")]
const TRAMPOLINE_BIN: &[u8] = include_bytes!(
"../../crates/pixi_trampoline/trampolines/pixi-trampoline-powerpc64le-unknown-linux-gnu.zst"
);

#[cfg(target_arch = "x86_64")]
#[cfg(target_os = "linux")]
const TRAMPOLINE_BIN: &[u8] = include_bytes!(
Expand Down Expand Up @@ -346,13 +353,6 @@ impl Trampoline {
}

async fn write_trampoline(&self) -> miette::Result<()> {
#[cfg(target_arch = "powerpc64")]
#[cfg(target_endian = "little")]
#[cfg(target_os = "linux")]
{
miette::bail!("powerpc64le is not supported for pixi global yet. If you need this, please open an issue on the pixi repository.");
}

let trampoline_path = self.trampoline_path();

// We need to check that there's indeed a trampoline at the path
Expand Down

0 comments on commit 2434827

Please sign in to comment.