Skip to content

build: Honor CARGO_TARGET_DIR in client build scripts #679

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

Open
celikgo wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −5
Open

build: Honor CARGO_TARGET_DIR in client build scripts #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1d0ca7
build: Honor CARGO_TARGET_DIR in client build scripts
celikgo Jun 11, 2026
84a8ded
build: Error when copy_built_library finds no built library
celikgo Jun 14, 2026
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
4 changes: 3 additions & 1 deletion bin/build_helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ copy_built_library() {
out_dir=$(dirname "$3"x) # trailing x to distinguish directories from files
echo_then_run mkdir -p "${out_dir}"
echo_then_run cp "${possible_library_path}" "$3/${possible_augmented_name}"
break
return
fi
done
echo "error: no built library '${2}' found in '${1}' (looked for lib${2}.dylib, lib${2}.so, ${2}.dll); is CARGO_TARGET_DIR set correctly?" >&2
exit 1
}

echo_then_run() {
Expand Down
5 changes: 3 additions & 2 deletions java/build_jni.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,9 @@ build_desktop_for_arch () {
fi

echo_then_run cargo build -p libsignal-jni -p libsignal-jni-testing ${RUST_RELEASE:+--release} ${FEATURES:+--features "${FEATURES[*]}"} --target "$1"
copy_built_library "target/${1}/${RUST_RELEASE:-debug}" signal_jni "$lib_dir" "signal_jni_${suffix}"
copy_built_library "target/${1}/${RUST_RELEASE:-debug}" signal_jni_testing "$lib_dir" "signal_jni_testing_${suffix}"
local build_dir="${CARGO_TARGET_DIR:-target}/${1}/${RUST_RELEASE:-debug}"
copy_built_library "$build_dir" signal_jni "$lib_dir" "signal_jni_${suffix}"
copy_built_library "$build_dir" signal_jni_testing "$lib_dir" "signal_jni_testing_${suffix}"
check_for_debug_level_logs_if_needed "$lib_dir"
}

Expand Down
4 changes: 3 additions & 1 deletion node/build_node_bridge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ def main(args: Optional[List[str]] = None) -> int:
# Luckily, Python's sys.platform matches Node's OS names for our supported targets.
parser.add_option('--os-name', default=sys.platform, metavar='OS',
help='specify Node OS name')
parser.add_option('--cargo-build-dir', default=os.path.join('..', 'target'), metavar='PATH',
parser.add_option('--cargo-build-dir',
default=os.environ.get('CARGO_TARGET_DIR') or os.path.join('..', 'target'),
metavar='PATH',
help='specify cargo build dir (default %default)')
parser.add_option('--cargo-target', default=None,
help='specify cargo target')
Expand Down
6 changes: 5 additions & 1 deletion swift/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@
// SPDX-License-Identifier: AGPL-3.0-only
//

import Foundation
import PackageDescription

let rustBuildDir = "../target/debug/"
// Honor a user-defined Cargo target directory (CARGO_TARGET_DIR) if set,
// falling back to the workspace default of `<repo>/target`.
let cargoTargetDir = ProcessInfo.processInfo.environment["CARGO_TARGET_DIR"] ?? "../target"
let rustBuildDir = "\(cargoTargetDir)/debug/"

let package = Package(
name: "LibSignalClient",
Expand Down