Skip to content

Commit d4d6b13

Browse files
twilfredosteven-bellock
authored andcommitted
CMakeLists: remove fixed options for NONE
The use of the NONE toolchain option is such that we can provide at the build project level (buildroot etc...). However, the changes introduced in 811f2b5 set certain compiler/linker option that does not comply with the definition of the options as specified in [1]. This change removes those options. [1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments Signed-off-by: Wilfred Mallawa <[email protected]>
1 parent 7046368 commit d4d6b13

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

CMakeLists.txt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
618618
SET(CMAKE_EXE_LINKER_FLAGS "")
619619

620620
SET(CMAKE_C_LINK_EXECUTABLE "")
621-
622-
elseif(TOOLCHAIN STREQUAL "NONE")
623-
ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration)
624-
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
625-
ADD_COMPILE_OPTIONS(-g)
626-
endif()
627-
if(GCOV STREQUAL "ON")
628-
ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage)
629-
endif()
630-
SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration)
631-
SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual)
632-
633-
SET(CMAKE_LINKER ${CMAKE_C_COMPILER})
634-
SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" )
635-
if(GCOV STREQUAL "ON")
636-
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage")
637-
endif()
638-
SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_LINKER> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> -Wl,--start-group <LINK_LIBRARIES> -Wl,--end-group")
639-
640621
endif()
641622

642623
if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC")

0 commit comments

Comments
 (0)