Skip to content

Commit b7e2760

Browse files
authored
Merge pull request #435 from rust-osdev/fix-ci
CI: Fix macOS errors
2 parents 4bd1ba4 + a263358 commit b7e2760

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
strategy:
3737
fail-fast: false
3838
matrix:
39-
os: [ubuntu-latest, macos-latest, windows-latest]
39+
os: [ubuntu-latest, macos-12, windows-latest, macos-latest]
4040
runs-on: ${{ matrix.os }}
4141
timeout-minutes: 30
4242

api/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ mod version_info {
106106
/// `#[link_section = ".bootloader-config"]`, which instructs the Rust compiler to store it
107107
/// in a special section of the resulting ELF executable. From there, the bootloader will
108108
/// automatically read it when loading the kernel.
109+
#[cfg(target_arch = "x86_64")]
109110
#[macro_export]
110111
macro_rules! entry_point {
111112
($path:path) => {
@@ -139,6 +140,7 @@ macro_rules! entry_point {
139140
}
140141

141142
#[doc(hidden)]
143+
#[cfg(target_arch = "x86_64")]
142144
pub fn __force_use(slice: &&[u8; BootloaderConfig::SERIALIZED_LEN]) {
143145
let force_use = slice as *const _ as usize;
144146
unsafe { core::arch::asm!("add {0}, 0", in(reg) force_use, options(nomem, nostack)) };

0 commit comments

Comments
 (0)