Skip to content

Commit 065e0db

Browse files
committed
Try to compile with macosx
1 parent e6162ba commit 065e0db

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

.github/workflows/macos.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ jobs:
3333
build:
3434
name: Build
3535
runs-on: macos-latest
36+
# Set environment variables
37+
env:
38+
# We globally set CC and CXX to improve compatibility with .travis.yml
39+
CC: x86_64-elf-gcc
40+
CXX: x86_64-elf-g++
3641
steps:
3742
- name: Clone repository
3843
uses: actions/checkout@v3

CMakeLists.txt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,6 @@ message(STATUS "Crosscompiling : ${CMAKE_CROSSCOMPILING}")
2828
message(STATUS "System name : ${CMAKE_HOST_SYSTEM_NAME}")
2929
message(STATUS "Kernel version : ${CMAKE_SYSTEM_VERSION}")
3030
if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE)
31-
# Set the Apple MacOSx compilers.
32-
if(CMAKE_VERSION VERSION_LESS "3.6.0")
33-
include(CMakeForceCompiler)
34-
cmake_force_c_compiler(x86_64-elf-gcc Clang)
35-
cmake_force_cxx_compiler(x86_64-elf-g++ Clang)
36-
else()
37-
set(CMAKE_C_COMPILER x86_64-elf-gcc)
38-
set(CMAKE_CXX_COMPILER x86_64-elf-g++)
39-
set(CMAKE_AR x86_64-elf-ar)
40-
endif()
41-
# Speicfy the linker.
42-
set(CMAKE_LINKER x86_64-elf-ld)
4331
# Specify the linker flags.
4432
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nostdlib")
4533
elseif((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") OR WIN32)

0 commit comments

Comments
 (0)