mirror of
https://gitlab.redox-os.org/redox-os/redox.git
synced 2026-06-22 21:04:18 +08:00
Merge branch 'fix-repo-dir' into 'master'
Fix repo directory install path See merge request redox-os/cookbook!672
This commit is contained in:
commit
beb030a45d
@ -275,7 +275,7 @@ fn publish_packages(recipe_names: &Vec<CookRecipe>, repo_path: &PathBuf) -> anyh
|
||||
let repo_bin = env::current_exe()?.parent().unwrap().join("repo_builder");
|
||||
let mut command = Command::new(repo_bin);
|
||||
command
|
||||
.arg(repo_path)
|
||||
.arg(repo_path.join(redoxer::target()))
|
||||
.args(recipe_names.iter().filter_map(|n| {
|
||||
if !n.is_deps {
|
||||
Some(n.name.as_str())
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
use std::{collections::BTreeSet, env, path::Path};
|
||||
use std::{collections::BTreeSet, path::Path};
|
||||
|
||||
use pkg::{Package, PackageName};
|
||||
|
||||
@ -85,7 +85,7 @@ pub fn package_toml(
|
||||
let package = Package {
|
||||
name: name.clone(),
|
||||
version: package_version(recipe),
|
||||
target: env::var("TARGET").map_err(|err| format!("failed to read TARGET: {:?}", err))?,
|
||||
target: redoxer::target().to_string(),
|
||||
depends,
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user