From 69a9613e4f0b27bf7091cf520c7b98e2cae29d63 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sat, 8 Jun 2024 18:00:30 -0400 Subject: [PATCH] Small Fixes --- dependencies/runtime/CMakeLists.txt | 4 +++- dependencies/runtime/src | 2 +- launcher/src/bootstrap.cpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dependencies/runtime/CMakeLists.txt b/dependencies/runtime/CMakeLists.txt index ed56a32d59..9929c24142 100644 --- a/dependencies/runtime/CMakeLists.txt +++ b/dependencies/runtime/CMakeLists.txt @@ -13,4 +13,6 @@ endif() add_subdirectory(src) # Install -install_runtime("${MCPI_BIN_DIR}" "${MCPI_LEGAL_DIR}") \ No newline at end of file +if(COMMAND install_runtime) + install_runtime("${MCPI_BIN_DIR}" "${MCPI_LEGAL_DIR}") +endif() \ No newline at end of file diff --git a/dependencies/runtime/src b/dependencies/runtime/src index e6839074fd..790e7918b1 160000 --- a/dependencies/runtime/src +++ b/dependencies/runtime/src @@ -1 +1 @@ -Subproject commit e6839074fd2eec91c5bb2e08705f2f235a568f74 +Subproject commit 790e7918b1d63102b7a7f39dc1db006b2a5abf48 diff --git a/launcher/src/bootstrap.cpp b/launcher/src/bootstrap.cpp index a80f47dbd5..ebecaaa668 100644 --- a/launcher/src/bootstrap.cpp +++ b/launcher/src/bootstrap.cpp @@ -58,7 +58,7 @@ void bootstrap() { print_debug_information(); // Check Page Size (Not Needed When Using QEMU) -#ifndef MCPI_USE_QEMU +#ifndef MCPI_RUNTIME_IS_QEMU long page_size = sysconf(_SC_PAGESIZE); if (page_size != REQUIRED_PAGE_SIZE) { ERR("Invalid page size! A page size of %ld bytes is required, but the system size is %ld bytes.", (long) REQUIRED_PAGE_SIZE, page_size);