fix CMake config

master
WangRunji 6 years ago
parent 227c552a45
commit 78bfb1f6ea

@ -17,7 +17,7 @@ env:
- ARCH="riscv32" - ARCH="riscv32"
- ARCH="riscv64" - ARCH="riscv64"
- ARCH="i386" - ARCH="i386"
- ARCH="x86_64" # - ARCH="x86_64"
- ARCH="aarch64" - ARCH="aarch64"
install: install:

@ -36,7 +36,7 @@ elseif (${ARCH} STREQUAL riscv64)
elseif (${ARCH} STREQUAL aarch64) elseif (${ARCH} STREQUAL aarch64)
set(PREFIX aarch64-none-elf-) set(PREFIX aarch64-none-elf-)
set(CMAKE_C_FLAGS "-mgeneral-regs-only") set(CMAKE_C_FLAGS "-mgeneral-regs-only")
set(CMAKE_C_LINK_FLAGS "-Ttext 0xffff000000000000") set(LINK_FLAGS "-Ttext 0xffff000000000000")
else() else()
message("Unsupported arch: ${ARCH}") message("Unsupported arch: ${ARCH}")
endif () endif ()
@ -45,8 +45,8 @@ set(CMAKE_C_COMPILER ${PREFIX}gcc)
set(CMAKE_RANLIB ${PREFIX}ranlib) set(CMAKE_RANLIB ${PREFIX}ranlib)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-builtin -nostdinc -fno-stack-protector -ggdb -Wall") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-builtin -nostdinc -fno-stack-protector -ggdb -Wall")
set(CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS}) set(CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS})
set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} -nostdlib") # get rid of '-Wl,-search_paths_first -Wl,-headerpad_max_install_names' set(CMAKE_C_LINK_FLAGS "${LINK_FLAGS} -nostdlib") # override default value to get rid of '-Wl,-search_paths_first -Wl,-headerpad_max_install_names'
set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS) # get rid of '-rdynamic' on Linux set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS) # override default value to get rid of '-rdynamic' on Linux
# Library # Library
add_library(ulib ${LIBS}) add_library(ulib ${LIBS})

Loading…
Cancel
Save