Skip to content

Target-Dir Init #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Eveeifyeve wants to merge 1 commit into from
Closed

Target-Dir Init #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions pkgs/by-name/ca/cargo-tauri/hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,6 @@ tauriBuildHook() {
# separateDebugInfo.
export "CARGO_PROFILE_${cargoBuildType@U}_STRIP"=false

if [ -n "${buildAndTestSubdir-}" ]; then
# ensure the output doesn't end up in the subdirectory
CARGO_TARGET_DIR="$(pwd)/target"
export CARGO_TARGET_DIR

# Tauri doesn't respect $CARGO_TARGET_DIR, but does respect the cargo
# argument...but that doesn't respect `--target`, so we have to use the
# config file
# https://github.com/tauri-apps/tauri/issues/10190
mkdir -p .cargo
printf '\nbuild.target-dir = "%s"' "$CARGO_TARGET_DIR" >>config.toml

pushd "${buildAndTestSubdir}"
fi

local cargoFlagsArray=(
"-j" "$NIX_BUILD_CORES"
"--target" "@rustHostPlatformSpec@"
Expand All @@ -44,6 +29,11 @@ tauriBuildHook() {
"--target" "@rustHostPlatformSpec@"
)

# https://github.com/tauri-apps/tauri/issues/10190 if fixed so we can default to `--target-dir`
if [ -n "${buildAndTestSubdir-}" ]; then
cargoFlagsArray+=("--target-dir" "$(pwd)/target")
fi

if [ "${cargoBuildType}" != "debug" ]; then
cargoFlagsArray+=("--profile" "${cargoBuildType}")
fi
Expand Down