Skip to content
This repository was archived by the owner on Aug 2, 2022. It is now read-only.

Commit 16cef4a

Browse files
move -Werror to CI only
1 parent 14a2a8b commit 16cef4a

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.cicd/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -eo pipefail
44
. ./.cicd/helpers/general.sh
55
mkdir -p "$BUILD_DIR"
66
[[ -z "$DCMAKE_BUILD_TYPE" ]] && export DCMAKE_BUILD_TYPE='Release'
7-
CMAKE_EXTRAS="-DCMAKE_BUILD_TYPE=\"$DCMAKE_BUILD_TYPE\" -DENABLE_MULTIVERSION_PROTOCOL_TEST=\"true\" -DAMQP_CONN_STR=\"amqp://guest:guest@localhost:5672\""
7+
CMAKE_EXTRAS="-DCMAKE_CXX_FLAGS=\"-Werror\" -DCMAKE_BUILD_TYPE=\"$DCMAKE_BUILD_TYPE\" -DENABLE_MULTIVERSION_PROTOCOL_TEST=\"true\" -DAMQP_CONN_STR=\"amqp://guest:guest@localhost:5672\""
88
if [[ "$(uname)" == 'Darwin' && "$FORCE_LINUX" != 'true' ]]; then
99
# You can't use chained commands in execute
1010
if [[ "$GITHUB_ACTIONS" == 'true' ]]; then

.cicd/helpers/clang.make

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ set(CMAKE_CXX_COMPILER_WORKS 1)
33
set(CMAKE_C_COMPILER /usr/local/bin/clang)
44
set(CMAKE_CXX_COMPILER /usr/local/bin/clang++)
55
set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES /usr/local/include/c++/v1 /usr/local/include /usr/include)
6-
set(CMAKE_C_FLAGS_INIT "-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie")
7-
set(CMAKE_CXX_FLAGS_INIT "-nostdinc++ -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fpie")
8-
set(CMAKE_EXE_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++ -pie")
6+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
7+
set(CMAKE_C_FLAGS_INIT "-D_FORTIFY_SOURCE=2 -fstack-protector-strong")
8+
set(CMAKE_CXX_FLAGS_INIT "-nostdinc++ -D_FORTIFY_SOURCE=2 -fstack-protector-strong")
9+
set(CMAKE_EXE_LINKER_FLAGS_INIT "-stdlib=libc++ -nostdlib++")
910
if(NOT APPLE)
1011
string(APPEND CMAKE_EXE_LINKER_FLAGS_INIT " -Wl,-z,relro,-z,now")
1112
endif()

CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ set( KEY_STORE_EXECUTABLE_NAME keosd )
3636
set( RODEOS_EXECUTABLE_NAME rodeos )
3737
set( TESTER_EXECUTABLE_NAME eosio-tester )
3838

39-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-unused-command-line-argument")
40-
4139
# http://stackoverflow.com/a/18369825
4240
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
4341
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
@@ -47,7 +45,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}
4745
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
4846
message(FATAL_ERROR "Clang version must be at least 5.0!")
4947
endif()
50-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-compare -Wrange-loop-analysis -Wno-unknown-warning-option")
48+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wsign-compare -Wrange-loop-analysis -Wno-unknown-warning-option -Wno-unused-command-line-argument")
5149
endif()
5250

5351

0 commit comments

Comments
 (0)