diff options
| author | Niels Sascha Reedijk <niels.reedijk@gmail.com> | 2020-09-19 09:17:53 +0100 |
|---|---|---|
| committer | Niels Sascha Reedijk <niels.reedijk@gmail.com> | 2020-10-16 08:32:41 +0100 |
| commit | 7b652d341e9a476658af8a9186972ce73ec38c3c (patch) | |
| tree | 1c005f226f22c65084632942476be647a8020ac0 | |
| parent | 8e6f69afc9b0943003ce51a53d1f59611e6601a3 (diff) | |
| download | rust-7b652d341e9a476658af8a9186972ce73ec38c3c.tar.gz rust-7b652d341e9a476658af8a9186972ce73ec38c3c.zip | |
Haiku: explicitly set CMAKE_SYSTEM_NAME when cross-compiling
This resolves issues where the cross-build of LLVM fails because it tries to link to the host's system libraries instead of the target's system libraries.
| -rw-r--r-- | src/bootstrap/native.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 6bba00ee85e..37d6fab070b 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -378,6 +378,8 @@ fn configure_cmake( cfg.define("CMAKE_SYSTEM_NAME", "FreeBSD"); } else if target.contains("windows") { cfg.define("CMAKE_SYSTEM_NAME", "Windows"); + } else if target.contains("haiku") { + cfg.define("CMAKE_SYSTEM_NAME", "Haiku"); } // When cross-compiling we should also set CMAKE_SYSTEM_VERSION, but in // that case like CMake we cannot easily determine system version either. |