language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 14:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix merge conflict

Browse source
This commit is contained in:
Folkert 2022-04-30 23:34:42 +02:00
parent 9491d5fae9
commit 7361a8aed2
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/builtins/build.rs
View file

@ -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)]