mirror of
https://github.com/roc-lang/roc.git
synced 2025-09-29 06:44:46 +00:00
fix merge conflict
This commit is contained in:
parent
9491d5fae9
commit
7361a8aed2
1 changed files with 1 additions and 6 deletions
|
@ -44,12 +44,7 @@ fn main() {
|
||||||
|
|
||||||
generate_bc_file(&bitcode_path, "ir-i386", "builtins-i386");
|
generate_bc_file(&bitcode_path, "ir-i386", "builtins-i386");
|
||||||
|
|
||||||
generate_bc_file(
|
generate_bc_file(&bitcode_path, "ir-x86_64", "builtins-x86_64");
|
||||||
&bitcode_path,
|
|
||||||
&build_script_dir_path,
|
|
||||||
"ir-x86_64",
|
|
||||||
"builtins-x86_64",
|
|
||||||
);
|
|
||||||
|
|
||||||
// OBJECT FILES
|
// OBJECT FILES
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue