Address PR comments

Signed-off-by: Jorge Prendes <jorge.prendes@gmail.com>

Author: jprendes

Cargo.lock

@@ -11,14 +11,14 @@ PWD := replace(justfile_dir(), "\\", "/")
 # * include the stubs required by hyperlight-js-runtime
 # * define __wasi__ as this disables threading support in quickjs
 export HYPERLIGHT_CFLAGS := \
-    "-I" + PWD + "/src/hyperlight-js-runtime/stubs/include " + \
+    "-I" + PWD + "/src/hyperlight-js-runtime/include " + \
     "-D__wasi__=1 "
 
 # On Windows, use Ninja generator for CMake to avoid aws-lc-sys build issues with Visual Studio generator
 export CMAKE_GENERATOR := if os() == "windows" { "Ninja" } else { "" }
 
 ensure-tools:
-    cargo install cargo-hyperlight --locked --version 0.1.7
+    cargo install cargo-hyperlight --locked
 
 # Check if npm is installed, install automatically if missing (Linux)
 [private]

Justfile

@@ -44,7 +44,6 @@ tempfile = "3.26"
 
 [build-dependencies]
 bindgen = "0.72"
-glob = "0.3"
 
 [features]
 default = []

src/hyperlight-js-runtime/Cargo.toml

@@ -28,7 +28,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .clang_arg("-D_POSIX_C_SOURCE=200809L");
 
     bindings = bindings.header_contents(
-        "libc_stubs.h",
+        "libc.h",
         "
         #pragma once
         #include <errno.h>
@@ -37,11 +37,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         ",
     );
 
-    println!("cargo:rerun-if-changed=stubs/include/stdio.h");
-    println!("cargo:rerun-if-changed=stubs/include/time.h");
+    println!("cargo:rerun-if-changed=include");
+    println!("cargo:rerun-if-changed=include/stdio.h");
+    println!("cargo:rerun-if-changed=include/time.h");
+    println!("cargo:rerun-if-changed=include/unistd.h");
 
     // Write the generated bindings to an output file.
-    let out_path = PathBuf::from(env::var("OUT_DIR")?).join("libc_stubs.rs");
+    let out_path = PathBuf::from(env::var("OUT_DIR")?).join("libc.rs");
     bindings.generate()?.write_to_file(out_path)?;
 
     Ok(())

src/hyperlight-js-runtime/build.rs

@@ -0,0 +1,29 @@
+/*
+Copyright 2026 The Hyperlight Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+#pragma once
+
+#include "printf.h"
+#include_next "stdio.h"
+
+#define stdout NULL
+
+int putchar(int c);
+
+#define vfprintf(f, ...) vprintf(__VA_ARGS__)
+#define fprintf(f, ...) printf(__VA_ARGS__)
+#define fputc(c, f) putc((char)(c), f)
+
+int fflush(FILE *f);

src/hyperlight-js-runtime/include/stdio.h

@@ -0,0 +1,28 @@
+/*
+Copyright 2026 The Hyperlight Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+#pragma once
+
+#include_next "time.h"
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <errno.h>
+
+#define CLOCK_REALTIME 0
+#define CLOCK_MONOTONIC 1
+
+int clock_gettime(clockid_t clk_id, struct timespec *tp);
+struct tm *localtime_r(const time_t *timer, struct tm *tm);

src/hyperlight-js-runtime/include/time.h

@@ -0,0 +1,15 @@
+/*
+Copyright 2026 The Hyperlight Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/

src/hyperlight-js-runtime/include/unistd.h

@@ -23,11 +23,8 @@ mod bindings {
         clippy::upper_case_acronyms,
         clippy::ptr_offset_with_cast
     )]
-    include!(concat!(env!("OUT_DIR"), "/libc_stubs.rs"));
+    include!(concat!(env!("OUT_DIR"), "/libc.rs"));
 }
 
-#[allow(unused_imports)] // not used in native.rs
-pub(crate) use core::ffi::*;
-
-#[allow(unused_imports)] // not used in native.rs
 pub(crate) use bindings::*;
+pub(crate) use core::ffi::*;

src/hyperlight-js-runtime/src/libc.rs

@@ -16,6 +16,7 @@ limitations under the License.
 #![cfg_attr(hyperlight, no_std)]
 #![cfg_attr(hyperlight, no_main)]
 
+#[cfg(hyperlight)]
 mod libc;
 
 #[cfg(hyperlight)]

src/hyperlight-js-runtime/src/main.rs

@@ -22,7 +22,7 @@ extern "C" fn putchar(c: libc::c_int) -> libc::c_int {
         // force a flush of the internal buffer in the hyperlight putchar implementation
         unsafe { libc::_putchar(0) };
     }
-    (c as libc::c_char) as libc::c_int
+    (c as u8) as libc::c_int
 }
 
 #[unsafe(no_mangle)]