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

Make sure BUILTINS_O gets set

Browse source
This commit is contained in:
Richard Feldman 2021-06-06 00:55:10 -04:00
parent 5b91de40db
commit 3684488629
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
compiler/builtins/build.rs
View file

@ -8,15 +8,22 @@ use std::process::Command;
use std::str; use std::str;
fn main() { fn main() {
let out_dir = env::var_os("OUT_DIR").unwrap();
let dest_obj_path = Path::new(&out_dir).join("builtins.o");
let dest_obj = dest_obj_path.to_str().expect("Invalid dest object path");
println!("cargo:rerun-if-changed=build.rs");
println!("cargo:rustc-env=BUILTINS_O={}", dest_obj);
// When we build on Netlify, zig is not installed (but also not used, // When we build on Netlify, zig is not installed (but also not used,
// since all we're doing is generating docs), so we can skip the steps // since all we're doing is generating docs), so we can skip the steps
// that require having zig installed. // that require having zig installed.
if env::var_os("NO_ZIG_INSTALLED").is_some() { if env::var_os("NO_ZIG_INSTALLED").is_some() {
// We still need to do the other things before this point, because
// setting the env vars is needed for other parts of the build.
return; return;
} }
let out_dir = env::var_os("OUT_DIR").unwrap();
let big_sur_path = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib"; let big_sur_path = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib";
let use_build_script = Path::new(big_sur_path).exists(); let use_build_script = Path::new(big_sur_path).exists();
@ -41,8 +48,6 @@ fn main() {
run_command(&bitcode_path, "zig", &["build", "ir", "-Drelease=true"]); run_command(&bitcode_path, "zig", &["build", "ir", "-Drelease=true"]);
} }
let dest_obj_path = Path::new(&out_dir).join("builtins.o");
let dest_obj = dest_obj_path.to_str().expect("Invalid dest object path");
println!("Moving zig object to: {}", dest_obj); println!("Moving zig object to: {}", dest_obj);
run_command(&bitcode_path, "mv", &[src_obj, dest_obj]); run_command(&bitcode_path, "mv", &[src_obj, dest_obj]);
@ -57,8 +62,6 @@ fn main() {
&[dest_ir, "-o", dest_bc], &[dest_ir, "-o", dest_bc],
); );
println!("cargo:rerun-if-changed=build.rs");
println!("cargo:rustc-env=BUILTINS_O={}", dest_obj);
get_zig_files(bitcode_path.as_path(), &|path| { get_zig_files(bitcode_path.as_path(), &|path| {
let path: &Path = path; let path: &Path = path;
println!( println!(