Improve cross compiling support #158

messense · 2022-07-26T10:42:08Z

This PR changes cmake-rs to fill out CMAKE_SYSTEM_NAME and CMAKE_SYSTEM_PROCESSOR based CARGO_CFG_TARGET_OS and CARGO_CFG_TARGET_ARCH when cross compiling while CMAKE_TOOLCHAIN_FILE and CMAKE_SYSTEM_NAME isn't set by user.

It's tested on CI using cross.

Closes #75
Closes #80
Closes #151

messense · 2022-07-26T12:26:42Z

src/lib.rs

+                    }
+                } else if target.contains("solaris") {
+                    if !self.defined("CMAKE_SYSTEM_NAME") {
+                        self.define("CMAKE_SYSTEM_NAME", "SunOS");


We can also address #151 by removing this if it's desirable.

cc @gco

Yes, please!

Fixes #151

thomcc

This looks great. Thanks for improving the CI too.

…Fixes rust-lang#173 In rust-lang#158, better support for using CMake's cross-compilation facilities was added. This made the workaround added in rust-lang#110 for iOS not only unnecessary, but actively harmful, in that it runs afoul of SDK validation checks in the CMake iOS codepath.

* add an iOS cross-compile test to CI * Fix zlib-ng compilation for iOS * Revert #110 to fix iOS cross-compilation after #158. Fixes #173 In #158, better support for using CMake's cross-compilation facilities was added. This made the workaround added in #110 for iOS not only unnecessary, but actively harmful, in that it runs afoul of SDK validation checks in the CMake iOS codepath. * Use checkout@v3 Co-authored-by: Yuki Okushi <[email protected]> --------- Co-authored-by: Thom Chiovoloni <[email protected]> Co-authored-by: Yuki Okushi <[email protected]>

jrose-signal · 2023-05-11T21:18:57Z

I'm afraid this broke no-toolchain cross-compilation using Visual Studio, from an x86_64 Windows host to aarch64-pc-windows-msvc. Things are a bit clunky there in general (the existing support goes through platforms and does not set CMAKE_SYSTEM_PROCESSOR), but it was working in 1.48.0 (and I'm afraid we hadn't been testing with new crate versions, so we didn't discover this sooner).

(Specifically, the auto-search for CMAKE_C_COMPILER and CMAKE_CXX_COMPILER doesn't kick in, even though it works fine for a non-cross-compile MSVS generator build.)

jrose-signal · 2023-05-11T22:38:22Z

Workaround: set CMAKE_SYSTEM_NAME to an empty string, which counts as defined for this crate, but unset for CMake itself.

jrose-signal · 2023-05-31T19:22:05Z

Turns out this also broke cross-compiling to Mac Catalyst targets (*-apple-ios-macabi), because CMake doesn't like having CMAKE_SYSTEM_NAME set to "iOS" while compiling against a macOS sysroot. That should probably eventually be fixed in CMake itself, but for now setting CMAKE_SYSTEM_NAME back to "Darwin" does work, at least for simple libraries. I don't know if you want to put that in this crate, though.

EDIT (months later): here's CMake not deciding what to do about Catalyst, which isn't cmake-rs's fault.

To avoid a panic in cmake-rs that was introduced in: rust-lang/cmake-rs#158

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 9ea58340da8e1236ebc1011c2e9495bdc7669583) Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 9ea58340da8e1236ebc1011c2e9495bdc7669583) Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 9ea58340da8e1236ebc1011c2e9495bdc7669583) Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: d1e7af5bc3d9349f5266e8bca68aedd19cc83e4b) Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 48b012e0aeb5d92b934bb16465ba29c9cc6a667b) Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 8f4c2346fe91d5c34cb10ba582a5735e0611fada) Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 51e9f95fe847b19abba2fd62e7c632865592a5be) Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 60b4b0808a3b961917ed8abe16b9f7df2a311952) Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 60b4b0808a3b961917ed8abe16b9f7df2a311952) Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 60b4b0808a3b961917ed8abe16b9f7df2a311952) Signed-off-by: Khem Raj <raj.khemgmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briandbootlin.com> Signed-off-by: Richard Purdie <richard.purdielinuxfoundation.org>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 60b4b0808a3b961917ed8abe16b9f7df2a311952) Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 (From OE-Core rev: 60b4b0808a3b961917ed8abe16b9f7df2a311952) Signed-off-by: Khem Raj <raj.khemgmail.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briandbootlin.com> Signed-off-by: Richard Purdie <richard.purdielinuxfoundation.org>

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]> Signed-off-by: Richard Purdie <[email protected]> (adapted from oe-core commit 60b4b0808a3b961917ed8abe16b9f7df2a311952) Signed-off-by: Scott Murray <[email protected]>

messense marked this pull request as ready for review July 26, 2022 12:10

messense mentioned this pull request Jul 26, 2022

Improve cross-compiling support #80

Closed

messense commented Jul 26, 2022

View reviewed changes

This was referenced Jul 27, 2022

arm64 macOS wheel is broken apache/horaedb-client-py#20

Closed

Remove Boring SSL WebAssembly/wasi-crypto#69

Closed

messense added 3 commits July 27, 2022 11:07

Improve cross compiling support

4e4612b

Also run cargo test on macOS and Windows

c5eb731

Stop always setting CMAKE_SYSTEM_NAME to SunOS for solaris

15ab68b

Fixes #151

thomwiggers mentioned this pull request Aug 18, 2022

ARMv8 compatibility: CI and cross-compiling? open-quantum-safe/liboqs-rust#127

Open

messense mentioned this pull request Aug 30, 2022

Add supported platforms to the build workflow for GitHub Actions kitao/pyxel#409

Closed

messense mentioned this pull request Sep 14, 2022

python polars 0.14.11 pola-rs/polars#4848

Merged

thomcc approved these changes Oct 28, 2022

View reviewed changes

thomcc merged commit cfe11fc into rust-lang:master Oct 28, 2022

pnkfelix mentioned this pull request Nov 11, 2022

Rust 1.60.0 fails to build on Solaris rust-lang/rust#96054

Closed

sburton84 mentioned this pull request Nov 29, 2022

Cross-compile improvements break the x86_64-fortanix-unknown-sgx target #170

Open

messense mentioned this pull request Dec 13, 2022

chore(python): remove unused cmake-rs patch pola-rs/polars#5794

Merged

luser mentioned this pull request Jan 27, 2023

Trying to cross compile zeromq-src for aarch64-apple-ios #173

Closed

luser mentioned this pull request Jan 27, 2023

Revert #110 to fix iOS cross-compilation after #158. Fixes #173 #176

Merged

jrose-signal mentioned this pull request Jun 29, 2023

Issue with 0.1.49 on Windows i686 cross compilation #171

Open

jrose-signal mentioned this pull request Nov 13, 2023

Don't set CMAKE_SYSTEM_NAME when using the Visual Studio generator #193

Open

madsmtm added a commit to madsmtm/rust that referenced this pull request Mar 22, 2025

bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling

ce6caef

To avoid a panic in cmake-rs that was introduced in: rust-lang/cmake-rs#158

madsmtm added a commit to madsmtm/rust that referenced this pull request Mar 22, 2025

bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling

c93efd1

To avoid a panic in cmake-rs that was introduced in: rust-lang/cmake-rs#158

madsmtm mentioned this pull request Mar 22, 2025

Bump boostrap cc to 1.2.17 and cmake to 0.1.54 rust-lang/rust#138784

Merged

madsmtm added a commit to madsmtm/rust that referenced this pull request Mar 22, 2025

bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling

061eda1

To avoid a panic in cmake-rs that was introduced in: rust-lang/cmake-rs#158

madsmtm added a commit to madsmtm/rust that referenced this pull request Mar 24, 2025

bootstrap: Always set CMAKE_SYSTEM_NAME when cross-compiling

38602d8

To avoid a panic in cmake-rs that was introduced in: rust-lang/cmake-rs#158

kraj added a commit to YoeDistro/poky that referenced this pull request Apr 3, 2025

rust-llvm: Disable benchmarks by cmake options

9808e60

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]>

kraj added a commit to YoeDistro/poky that referenced this pull request Apr 3, 2025

rust-llvm: Disable benchmarks by cmake options

bb4a932

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]>

kraj added a commit to YoeDistro/poky that referenced this pull request Apr 4, 2025

rust-llvm: Disable benchmarks by cmake options

3215d02

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]>

kraj added a commit to YoeDistro/poky that referenced this pull request Apr 4, 2025

rust-llvm: Disable benchmarks by cmake options

d7430ae

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]>

kraj added a commit to YoeDistro/poky that referenced this pull request Apr 4, 2025

rust-llvm: Disable benchmarks by cmake options

0a20197

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]>

kraj added a commit to YoeDistro/poky that referenced this pull request Apr 5, 2025

rust-llvm: Disable benchmarks by cmake options

7d99355

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]>

kraj added a commit to YoeDistro/poky that referenced this pull request Apr 5, 2025

rust-llvm: Disable benchmarks by cmake options

5168c29

Drop patch to exclusively disable it in code It seems to be fixed upstream [1] [1] rust-lang/cmake-rs#158 Signed-off-by: Khem Raj <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Improve cross compiling support #158

Improve cross compiling support #158

Uh oh!

messense commented Jul 26, 2022 •

edited

Loading

Uh oh!

messense Jul 26, 2022 •

edited

Loading

Uh oh!

gco Jul 28, 2022

Uh oh!

thomcc left a comment

Uh oh!

jrose-signal commented May 11, 2023 •

edited

Loading

Uh oh!

jrose-signal commented May 11, 2023

Uh oh!

jrose-signal commented May 31, 2023 •

edited

Loading

Uh oh!

Uh oh!

Improve cross compiling support #158

Improve cross compiling support #158

Uh oh!

Conversation

messense commented Jul 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

messense Jul 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gco Jul 28, 2022

Choose a reason for hiding this comment

Uh oh!

thomcc left a comment

Choose a reason for hiding this comment

Uh oh!

jrose-signal commented May 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jrose-signal commented May 11, 2023

Uh oh!

jrose-signal commented May 31, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

messense commented Jul 26, 2022 •

edited

Loading

messense Jul 26, 2022 •

edited

Loading

jrose-signal commented May 11, 2023 •

edited

Loading

jrose-signal commented May 31, 2023 •

edited

Loading