1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From: Matthias Geiger <werdahias@debian.org>
Date: Sat, 30 Aug 2025 12:00:16 -0400
Subject: Allow build with debian crates
Forwarded: not-needed
Last-Update: 2025-04-10
Last-Update: 2025-04-10
---
meson.options | 4 ++++
src/meson.build | 4 +---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meson.options b/meson.options
index e24f101..33ba5bb 100644
--- a/meson.options
+++ b/meson.options
@@ -8,3 +8,7 @@ option(
value: 'default',
description: 'The build profile for Bustle. One of "default" or "development".'
)
+option(
+ 'host_arch',
+ type: 'string',
+)
diff --git a/src/meson.build b/src/meson.build
index d99036d..ffa7d7a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -30,7 +30,6 @@ else
message('Building in debug mode')
endif
-cargo_env = [ 'CARGO_HOME=' + meson.project_build_root() / 'cargo-home' ]
cargo_build = custom_target(
'cargo-build',
@@ -43,10 +42,9 @@ cargo_build = custom_target(
depends: resources,
command: [
'env',
- cargo_env,
cargo, 'build',
cargo_options,
'&&',
- 'cp', 'src' / rust_target / meson.project_name(), '@OUTPUT@',
+ 'cp', 'src' / get_option('host_arch') / 'release' / meson.project_name(), '@OUTPUT@',
]
)
|
