lzh/MentOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve compatibility for Ubuntu 18.04

Browse Source 
Disable ASM_NASM language and take only ASM language with third_party nasm tool to avoid errors.
This commit is contained in:
Mirco De Marchi
2021-01-19 15:43:53 +01:00
parent f99b9f739c
commit b47110b402
3 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2
View File
@@ -3,6 +3,8 @@
project(MentOs) project(MentOs)
cmake_minimum_required(VERSION 2.8.4) cmake_minimum_required(VERSION 2.8.4)
message(STATUS "Crosscompiling: ${CMAKE_CROSSCOMPILING}")
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Add operating system specific option. # Add operating system specific option.
message(STATUS "System name: ${CMAKE_HOST_SYSTEM_NAME}") message(STATUS "System name: ${CMAKE_HOST_SYSTEM_NAME}")
mentos/CMakeLists.txt
+9 -9
View File
@@ -1,16 +1,16 @@
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Initialize the project. # Initialize the project.
project(MentOs C ASM ASM_NASM) project(MentOs C ASM)
set(PROJECT_NAME MentOs) set(PROJECT_NAME MentOs)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Add operating system specific option. # Add operating system specific option.
if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE) # Apple MacOSx if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE) # Apple MacOSx
set(CMAKE_ASM_NASM_COMPILER nasm) set(CMAKE_ASM_COMPILER nasm)
elseif ((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") OR WIN32) # Windows elseif ((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") OR WIN32) # Windows
set(CMAKE_ASM_NASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm) set(CMAKE_ASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm)
else () # Generic Unix System else () # Generic Unix System
set(CMAKE_ASM_NASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm) set(CMAKE_ASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm)
endif () endif ()
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@@ -144,11 +144,11 @@ endif (CMAKE_BUILD_TYPE MATCHES "Release")
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Set the assembly flags. # Set the assembly flags.
set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -g") set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -g")
set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -O0") set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -O0")
set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -f elf") set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -f elf")
set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -F dwarf") set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -F dwarf")
set(CMAKE_ASM_NASM_COMPILE_OBJECT "<CMAKE_ASM_NASM_COMPILER> <FLAGS> <SOURCE> -o <OBJECT>") set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <FLAGS> <SOURCE> -o <OBJECT>")
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Add the includes. # Add the includes.
toolchain.cmake
-12
View File
@@ -1,17 +1,5 @@
set(CMAKE_SYSTEM_NAME Generic) set(CMAKE_SYSTEM_NAME Generic)
message(STATUS "Cross compiling")
# ------------------------------------------------------------------------------
# Add operating system specific option.
if((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin") OR APPLE) # Apple MacOSx
set(CMAKE_ASM_NASM_COMPILER nasm)
elseif ((${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") OR WIN32) # Windows
set(CMAKE_ASM_NASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm)
else () # Generic Unix System
set(CMAKE_ASM_NASM_COMPILER ${CMAKE_SOURCE_DIR}/third_party/nasm/bin/nasm)
endif ()
if(CMAKE_VERSION VERSION_LESS "3.6.0") if(CMAKE_VERSION VERSION_LESS "3.6.0")
INCLUDE(CMakeForceCompiler) INCLUDE(CMakeForceCompiler)
CMAKE_FORCE_C_COMPILER(i386-elf-gcc Clang) CMAKE_FORCE_C_COMPILER(i386-elf-gcc Clang)