Skip to content

Allow providing hermetic nasm binary #3461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dzbarsky wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −1
Open

Allow providing hermetic nasm binary #3461

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,12 @@ fn build_nasm_files() {
if let Some((hash, hash_path)) =
hash_changed(asm_files, &out_dir, &dest_path)
{
let obj = nasm_rs::Build::new()
let mut nasm_build = nasm_rs::Build::new();
if let Ok(nasm) = env::var("NASM") {
nasm_build.nasm(nasm);
}

let obj = nasm_build
.min_version(2, 15, 0)
.include(&out_dir)
.include("src")
Expand All @@ -143,6 +148,7 @@ fn build_nasm_files() {
.unwrap_or_else(|e| {
panic!("NASM build failed. Make sure you have nasm installed or disable the \"asm\" feature.\n\
You can get NASM from https://nasm.us or your system's package manager.\n\
Alternatively, you can configure the path to a NASM binary via the "NASM" env var.\n\
\n\
error: {e}");
});
Expand Down