Commit 9a123697e30a15a178767d7bb9237528044c129d | zig

author	Andrew Kelley <andrew@ziglang.org> 2018-09-05 10:18:12-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2018-09-05 10:18:12-04:00
log	9a123697e30a15a178767d7bb9237528044c129d
tree	fb1aed31b7d0eb7f5e2124f8ccb7c0a5c1945cdc
parent	ac3cf0775fc999900d58e606211d2b942c6a40d4
signature	Commit is signed but in an unrecognized format.

fix compile error on gcc 7.3.0

Only set -Werror for debug builds, and only for zig itself, not for
embedded LLD.

See #1474

1 files changed, 12 insertions(+), 9 deletions(-)

CMakeLists.txt

CMakeLists.txt+12-9

...	...	@@ -196,7 +196,7 @@ else()
196	196	if(MSVC)
197	197	set(ZIG_LLD_COMPILE_FLAGS "-std=c++11 -D_CRT_SECURE_NO_WARNINGS /w")
198	198	else()
199		set(ZIG_LLD_COMPILE_FLAGS "-std=c++11 -fno-exceptions -fno-rtti -Wno-comment -Wno-class-memaccess -Wno-unknown-warning-option")
	199	set(ZIG_LLD_COMPILE_FLAGS "-std=c++11 -fno-exceptions -fno-rtti -Wno-comment")
200	200	endif()
201	201	set_target_properties(embedded_lld_lib PROPERTIES
202	202	COMPILE_FLAGS ${ZIG_LLD_COMPILE_FLAGS}
...	...	@@ -772,20 +772,23 @@ include_directories(
772	772	"${CMAKE_SOURCE_DIR}/src"
773	773	)
774	774
775		if(MSVC)
776		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /w")
777		elseif(MINGW)
778		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Werror -Wno-error=format= -Wno-error=format -Wno-error=format-extra-args")
779		else()
780		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror -Wall -Wno-unknown-warning-option -Wno-error=class-memaccess")
781		endif()
782
783	775	if(MSVC)
784	776	set(EXE_CFLAGS "-std=c++11")
785	777	else()
786	778	set(EXE_CFLAGS "-std=c++11 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -fno-exceptions -fno-rtti -Werror=strict-prototypes -Werror=old-style-definition -Werror=type-limits -Wno-missing-braces")
787	779	endif()
788	780
	781	if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
	782	if(MSVC)
	783	set(EXE_CFLAGS "${EXE_CFLAGS} /w")
	784	elseif(MINGW)
	785	set(EXE_CFLAGS "${EXE_CFLAGS} -Wall -Werror -Wno-error=format= -Wno-error=format -Wno-error=format-extra-args")
	786	else()
	787	set(EXE_CFLAGS "${EXE_CFLAGS} -Werror -Wall")
	788	endif()
	789	endif()
	790
	791
789	792	set(EXE_LDFLAGS " ")
790	793	if(MINGW)
791	794	set(EXE_LDFLAGS "-static -static-libgcc -static-libstdc++")