Skip to content

Commit 1761c6b

Browse files
committed
Rename out-dir -> artifact-dir.
1 parent 7035774 commit 1761c6b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/bin/cargo-batch.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fn main2(config: &mut GlobalContext) -> CliResult {
111111
Some(&ws),
112112
ProfileChecking::Custom,
113113
)?;
114-
if let Some(out_dir) = args.value_of_path("out-dir", config) {
114+
if let Some(out_dir) = args.value_of_path("artifact-dir", config) {
115115
compile_opts.build_config.export_dir = Some(out_dir);
116116
} else if let Some(out_dir) = config.build_config()?.out_dir.as_ref() {
117117
let out_dir = out_dir.resolve_path(config);
@@ -120,7 +120,7 @@ fn main2(config: &mut GlobalContext) -> CliResult {
120120
//if compile_opts.build_config.export_dir.is_some() {
121121
// config
122122
// .cli_unstable()
123-
// .fail_if_stable_opt("--out-dir", 6790)?;
123+
// .fail_if_stable_opt("--artifact-dir", 6790)?;
124124
//}
125125

126126
//println!("compile opts: {:#?}", compile_opts);
@@ -246,7 +246,7 @@ pub fn build_cli() -> Command {
246246
.arg_target_triple("Build for the target triple")
247247
.arg(
248248
opt(
249-
"out-dir",
249+
"artifact-dir",
250250
"Copy final artifacts to this directory (unstable)",
251251
)
252252
.value_name("PATH")

src/cargo/core/compiler/build_runner/compilation_files.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ impl<'a, 'gctx: 'a> CompilationFiles<'a, 'gctx> {
564564
.map(|hardlink| export_dir.join(hardlink.file_name().unwrap()))
565565
})
566566
};
567-
if !self.do_uplift {
567+
if !self.do_uplift && !unit.target.is_custom_build() {
568568
hardlink = None
569569
}
570570
outputs.push(OutputFile {

0 commit comments

Comments
 (0)