Use x86_64-elf-gcc under MacOS
This commit is contained in:
@@ -18,11 +18,6 @@ jobs:
|
||||
build:
|
||||
name: Build
|
||||
runs-on: macos-latest
|
||||
# Set environment variables
|
||||
#env:
|
||||
# We globally set CC and CXX.
|
||||
# CC: x86_64-elf-gcc
|
||||
# CXX: x86_64-elf-g++
|
||||
steps:
|
||||
- name: Clone repository
|
||||
uses: actions/checkout@v3
|
||||
@@ -31,5 +26,5 @@ jobs:
|
||||
brew install x86_64-elf-gcc git cmake nasm
|
||||
- name: Build
|
||||
run: |
|
||||
cmake -B build
|
||||
cmake -DCMAKE_C_COMPILER=/usr/local/bin/x86_64-elf-gcc -DCMAKE_CXX_COMPILER=/usr/local/bin/x86_64-elf-g++ -DCMAKE_ASM_COMPILER=/usr/local/bin/nasm -B build
|
||||
cmake --build build --parallel 2
|
||||
|
||||
@@ -5,13 +5,6 @@
|
||||
# Set the minimum required version of cmake.
|
||||
cmake_minimum_required(VERSION 3.1...3.22)
|
||||
|
||||
if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE)
|
||||
set(CMAKE_C_COMPILER /usr/local/bin/x86_64-elf-gcc)
|
||||
set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-elf-g++)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdlib")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")
|
||||
endif()
|
||||
|
||||
# Initialize the project.
|
||||
project(libc C ASM)
|
||||
|
||||
|
||||
@@ -1,15 +1,10 @@
|
||||
# =============================================================================
|
||||
# Author: Enrico Fraccaroli
|
||||
# =============================================================================
|
||||
|
||||
# Set the minimum required version of cmake.
|
||||
cmake_minimum_required(VERSION 3.1...3.22)
|
||||
|
||||
if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE)
|
||||
set(CMAKE_C_COMPILER /usr/local/bin/x86_64-elf-gcc)
|
||||
set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-elf-g++)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdlib")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")
|
||||
endif()
|
||||
|
||||
# Initialize the project.
|
||||
project(kernel C ASM)
|
||||
|
||||
|
||||
@@ -5,13 +5,6 @@
|
||||
# Set the minimum required version of cmake.
|
||||
cmake_minimum_required(VERSION 3.1...3.22)
|
||||
|
||||
if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE)
|
||||
set(CMAKE_C_COMPILER /usr/local/bin/x86_64-elf-gcc)
|
||||
set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-elf-g++)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdlib")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")
|
||||
endif()
|
||||
|
||||
# Initialize the project.
|
||||
project(programs C)
|
||||
|
||||
|
||||
@@ -5,13 +5,6 @@
|
||||
# Set the minimum required version of cmake.
|
||||
cmake_minimum_required(VERSION 3.1...3.22)
|
||||
|
||||
if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE)
|
||||
set(CMAKE_C_COMPILER /usr/local/bin/x86_64-elf-gcc)
|
||||
set(CMAKE_CXX_COMPILER /usr/local/bin/x86_64-elf-g++)
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdlib")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")
|
||||
endif()
|
||||
|
||||
# Initialize the project.
|
||||
project(tests C)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user