]>
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" | |
7 | -export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target | |
8 | +export CARGO_TARGET_OPT="--target x86_64-unknown-linux-gnux32" | |
9 | +export CARGO_TARGET_DIR="$MESON_BUILD_ROOT"/target/x86_64-unknown-linux-gnux32 | |
10 | export CARGO_HOME="$CARGO_TARGET_DIR"/cargo-home | |
11 | FEATURES="$6" | |
12 | ||
13 | if [ $4 = "Devel" ] | |
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 && \ | |
19 | cp "$CARGO_TARGET_DIR"/debug/$5 $3 | |
20 | else | |
21 | echo "RELEASE MODE" | |
22 | - cargo build --manifest-path \ | |
23 | + cargo build $CARGO_TARGET_OPT --manifest-path \ | |
24 | "$MESON_SOURCE_ROOT"/Cargo.toml $FEATURES --release && \ | |
25 | cp "$CARGO_TARGET_DIR"/release/$5 $3 | |
26 | fi |