authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-05 12:10:53-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-09-05 12:10:53-04:00
logba7836ea4859b244bf2c7749cc91853ea5512e26
tree8078faaa387fae198822eca8ff15d847bcf4aefa
parenta76a72469bf5980946fad8f8e60f07edde543ce5

stage1: fix build on macos

1 files changed, 8 insertions(+), 6 deletions(-)

CMakeLists.txt+8-6
...@@ -772,12 +772,8 @@ include_directories(...@@ -772,12 +772,8 @@ include_directories(
772 "${CMAKE_SOURCE_DIR}/src"772 "${CMAKE_SOURCE_DIR}/src"
773)773)
774774
775if(MSVC)775# These have to go before the -Wno- flags
776 set(EXE_CFLAGS "-std=c++11")776set(EXE_CFLAGS "-std=c++11")
777else()
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")
779endif()
780
781if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")777if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
782 if(MSVC)778 if(MSVC)
783 set(EXE_CFLAGS "${EXE_CFLAGS} /w")779 set(EXE_CFLAGS "${EXE_CFLAGS} /w")
...@@ -788,6 +784,12 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")...@@ -788,6 +784,12 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
788 endif()784 endif()
789endif()785endif()
790786
787if(MSVC)
788 set(EXE_CFLAGS "${EXE_CFLAGS}")
789else()
790 set(EXE_CFLAGS "${EXE_CFLAGS} -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")
791endif()
792
791793
792set(EXE_LDFLAGS " ")794set(EXE_LDFLAGS " ")
793if(MINGW)795if(MINGW)