]>
Commit | Line | Data |
---|---|---|
5de4e15d JB |
1 | --- gnome-tour-40.0/build-aux/cargo.sh.orig 2021-03-23 16:31:44.642007800 +0100 |
2 | +++ gnome-tour-40.0/build-aux/cargo.sh 2021-04-24 17:48:45.504234520 +0200 | |
85e1073f JB |
3 | @@ -2,19 +2,20 @@ |
4 | ||
5 | export MESON_BUILD_ROOT="$1" | |
6 | export MESON_SOURCE_ROOT="$2" | |
85e1073f | 7 | +export CARGO_TARGET_OPT="--target x86_64-unknown-linux-gnux32" |
2cbe506f | 8 | export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target |
85e1073f JB |
9 | export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home |
10 | FEATURES="$6" | |
11 | ||
614761a2 JB |
12 | -if [ $4 = "Devel" ] |
13 | +if [ "$4" = "Devel" ] | |
85e1073f JB |
14 | then |
15 | echo "DEBUG MODE" | |
16 | - cargo build --manifest-path \ | |
17 | + cargo build $CARGO_TARGET_OPT --manifest-path \ | |
18 | "$MESON_SOURCE_ROOT"/Cargo.toml $FEATURES && \ | |
2cbe506f JB |
19 | - cp "$CARGO_TARGET_DIR"/debug/$5 $3 |
20 | + cp "$CARGO_TARGET_DIR"/debug/x86_64-unknown-linux-gnux32/$5 $3 | |
85e1073f JB |
21 | else |
22 | echo "RELEASE MODE" | |
23 | - cargo build --manifest-path \ | |
24 | + cargo build $CARGO_TARGET_OPT --manifest-path \ | |
25 | "$MESON_SOURCE_ROOT"/Cargo.toml $FEATURES --release && \ | |
2cbe506f JB |
26 | - cp "$CARGO_TARGET_DIR"/release/$5 $3 |
27 | + cp "$CARGO_TARGET_DIR"/release/x86_64-unknown-linux-gnux32/$5 $3 | |
85e1073f | 28 | fi |