Use x86_64-elf- with macosx

.github/workflows/macos.yml

@@ -1,46 +1,48 @@
 name: MacOS
 on:
-    push:
-        branches-ignore:
-            - "releases/**"
-        paths-ignore:
-            - "**.md"
-            - ".gitignore"
-    pull_request:
-        paths-ignore:
-            - "**.md"
-            - ".gitignore"
+  push:
+    branches-ignore:
+      - "releases/**"
+    paths-ignore:
+      - "**.md"
+      - ".gitignore"
+      - "ubuntu.yml"
+  pull_request:
+    paths-ignore:
+      - "**.md"
+      - ".gitignore"
+      - "ubuntu.yml"
 jobs:
-    doxygen:
-        name: Doxygen
-        runs-on: macos-latest
-        steps:
-            - name: Clone repository
-              uses: actions/checkout@v3
+  doxygen:
+    name: Doxygen
+    runs-on: macos-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
 
-            - name: Install dependencies
-              run: |
-                    brew update
-                    brew install doxygen
+      - name: Install dependencies
+        run: |
+          brew update
+          brew install x86_64-elf-binutils x86_64-elf-gcc git cmake qemu nasm e2fsprogs doxygen
 
-            - name: Generate documentation
-              run: |
-                  cmake -B build -D DOXYGEN_WARN_AS_ERROR=NO
-                  cmake --build build --target mentos_documentation
+      - name: Generate documentation
+        run: |
+          cmake -B build -D DOXYGEN_WARN_AS_ERROR=NO
+          cmake --build build --target mentos_documentation
 
-    build:
-        name: Build
-        runs-on: macos-latest
-        steps:
-            - name: Clone repository
-              uses: actions/checkout@v3
+  build:
+    name: Build
+    runs-on: macos-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v3
 
-            - name: Install dependencies
-              run: |
-                  brew update
-                  brew install i386-elf-binutils i386-elf-gcc git cmake qemu nasm e2fsprogs
-              
-            - name: Build
-              run: |
-                  cmake -B build
-                  cmake --build build --parallel 2
+      - name: Install dependencies
+        run: |
+          brew update
+          brew install x86_64-elf-binutils x86_64-elf-gcc git cmake qemu nasm e2fsprogs
+
+      - name: Build
+        run: |
+          cmake -B build
+          cmake --build build --parallel 2

.github/workflows/ubuntu.yml

@@ -6,10 +6,12 @@ on:
         paths-ignore:
             - "**.md"
             - ".gitignore"
+            - "macos.yml"
     pull_request:
         paths-ignore:
             - "**.md"
             - ".gitignore"
+            - "macos.yml"
 jobs:
     doxygen:
         name: Doxygen

CMakeLists.txt

@@ -31,15 +31,15 @@ if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE)
     # Set the Apple MacOSx compilers.
     if(CMAKE_VERSION VERSION_LESS "3.6.0")
         include(CMakeForceCompiler)
-        cmake_force_c_compiler(i386-elf-gcc Clang)
-        cmake_force_cxx_compiler(i386-elf-g++ Clang)
+        cmake_force_c_compiler(x86_64-elf-gcc Clang)
+        cmake_force_cxx_compiler(x86_64-elf-g++ Clang)
     else()
-        set(CMAKE_C_COMPILER i386-elf-gcc)
-        set(CMAKE_CXX_COMPILER i386-elf-g++)
-        set(CMAKE_AR i386-elf-ar)
+        set(CMAKE_C_COMPILER x86_64-elf-gcc)
+        set(CMAKE_CXX_COMPILER x86_64-elf-g++)
+        set(CMAKE_AR x86_64-elf-ar)
     endif()
     # Speicfy the linker.
-    set(CMAKE_LINKER i386-elf-ld)
+    set(CMAKE_LINKER x86_64-elf-ld)
     # Specify the linker flags.
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")
 elseif((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") OR WIN32)