diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8e477f0..6156d67 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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 diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt index ba762aa..95f3b3e 100644 --- a/libc/CMakeLists.txt +++ b/libc/CMakeLists.txt @@ -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) diff --git a/mentos/CMakeLists.txt b/mentos/CMakeLists.txt index 03a1a7b..e43b51d 100644 --- a/mentos/CMakeLists.txt +++ b/mentos/CMakeLists.txt @@ -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) diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index 9204aa4..89daecf 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -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) diff --git a/programs/tests/CMakeLists.txt b/programs/tests/CMakeLists.txt index 9ad0b5c..6779e6b 100644 --- a/programs/tests/CMakeLists.txt +++ b/programs/tests/CMakeLists.txt @@ -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)