Skip to content

Commit 551e739

Browse files
committed
fix: mac brew
1 parent 2bc69f9 commit 551e739

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

src/ast/compiler.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,9 @@ pub fn compile(db: &dyn Db, docs: MemDocsInput, out: String, op: Options) {
313313
}
314314
let mut fo = out.to_string();
315315
let mut out = out.to_string();
316+
#[cfg(all(target_os = "macos", target_arch = "x86_64"))]
317+
let pl_target = Target::search("x86_64-apple-darwin").expect("get target failed");
318+
#[cfg(not(all(target_os = "macos", target_arch = "x86_64")))]
316319
let pl_target = Target::host_target().expect("get host target failed");
317320
out.push_str(".bc");
318321
llvmmod.set_triple(&tm.get_triple());

src/utils/read_config.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ pub fn get_config(db: &dyn Db, entry: SourceProgram) -> Result<Config, String> {
116116
&read_to_string(lockfile.clone()).unwrap_or_default(),
117117
)
118118
.unwrap_or_default();
119+
let mut sum_changed = false;
119120
if config.deps.is_none() {
120121
config.deps = Some(deps);
121122
} else {
@@ -154,6 +155,8 @@ pub fn get_config(db: &dyn Db, entry: SourceProgram) -> Result<Config, String> {
154155
}
155156
if let Some(sum) = sums.get(k) {
156157
b = sum.git.clone().unwrap().commit;
158+
} else {
159+
sum_changed = true;
157160
}
158161
let target = kagari::cp_to_hash_dir(target.to_str().unwrap(), &b);
159162
sums.insert(
@@ -214,9 +217,13 @@ pub fn get_config(db: &dyn Db, entry: SourceProgram) -> Result<Config, String> {
214217
}
215218
config.deps = Some(deps);
216219
}
217-
toml::to_string_pretty(&sums)
218-
.map_err(|e| format!("error: {:?}", e))
219-
.and_then(|s| std::fs::write(lockfile, s).or_else(|e| Err(format!("error: {:?}", e))))?;
220+
if sum_changed {
221+
toml::to_string_pretty(&sums)
222+
.map_err(|e| format!("error: {:?}", e))
223+
.and_then(|s| {
224+
std::fs::write(lockfile, s).or_else(|e| Err(format!("error: {:?}", e)))
225+
})?;
226+
}
220227
config.root = dunce::canonicalize(config_root.clone())
221228
.unwrap()
222229
.to_str()

0 commit comments

Comments
 (0)