diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2015-12-21 21:00:12 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2015-12-21 21:00:12 -0800 |
| commit | 38e554e5dcb8f6de9c014c5e1839b564a64937f6 (patch) | |
| tree | 7d6466939374c7adcacb2c52355d292188227e3b /src/pal | |
| parent | af2a0226b867cc5b74499cc28ce72682c07638e6 (diff) | |
| parent | 3df44ef76ffc7d3c9932eb24e9e1e1d71f02c069 (diff) | |
| download | coreclr-38e554e5dcb8f6de9c014c5e1839b564a64937f6.tar.gz coreclr-38e554e5dcb8f6de9c014c5e1839b564a64937f6.tar.bz2 coreclr-38e554e5dcb8f6de9c014c5e1839b564a64937f6.zip | |
Merge pull request #2425 from erozenfeld/CheckedBuild
Enable checked builds of CoreCLR.
Diffstat (limited to 'src/pal')
| -rw-r--r-- | src/pal/tools/clang-compiler-override.txt | 5 | ||||
| -rwxr-xr-x | src/pal/tools/gen-buildsys-clang.sh | 4 | ||||
| -rw-r--r-- | src/pal/tools/windows-compiler-override.txt | 7 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/pal/tools/clang-compiler-override.txt b/src/pal/tools/clang-compiler-override.txt index 7d99902be5..349bd07209 100644 --- a/src/pal/tools/clang-compiler-override.txt +++ b/src/pal/tools/clang-compiler-override.txt @@ -1,14 +1,17 @@ SET (CMAKE_C_FLAGS_INIT "-Wall -std=c11") SET (CMAKE_C_FLAGS_DEBUG_INIT "-g -O0") +SET (CMAKE_C_FLAGS_CHECKED_INIT "-g -O1") SET (CMAKE_C_FLAGS_RELEASE_INIT "-O3") SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "-O2 -g") SET (CMAKE_CXX_FLAGS_INIT "-Wall -Wno-null-conversion -std=c++11") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "-g -O0") +SET (CMAKE_CXX_FLAGS_CHECKED_INIT "-g -O1") SET (CMAKE_CXX_FLAGS_RELEASE_INIT "-O3") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-O2") -SET (CLR_DEFINES_DEBUG_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1 WRITE_BARRIER_CHECK=1) +SET (CLR_DEFINES_DEBUG_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1) +SET (CLR_DEFINES_CHECKED_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1) SET (CLR_DEFINES_RELEASE_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) SET (CLR_DEFINES_RELWITHDEBINFO_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) diff --git a/src/pal/tools/gen-buildsys-clang.sh b/src/pal/tools/gen-buildsys-clang.sh index 326b01c353..ea8194fc1f 100755 --- a/src/pal/tools/gen-buildsys-clang.sh +++ b/src/pal/tools/gen-buildsys-clang.sh @@ -43,8 +43,8 @@ generator="Unix Makefiles" for i in "${@:5}"; do upperI="$(echo $i | awk '{print toupper($0)}')" case $upperI in - # Possible build types are DEBUG, RELEASE, RELWITHDEBINFO, MINSIZEREL. - DEBUG | RELEASE | RELWITHDEBINFO | MINSIZEREL) + # Possible build types are DEBUG, CHECKED, RELEASE, RELWITHDEBINFO, MINSIZEREL. + DEBUG | CHECKED | RELEASE | RELWITHDEBINFO | MINSIZEREL) buildtype=$upperI ;; COVERAGE) diff --git a/src/pal/tools/windows-compiler-override.txt b/src/pal/tools/windows-compiler-override.txt index 071f3043e2..f76601bc49 100644 --- a/src/pal/tools/windows-compiler-override.txt +++ b/src/pal/tools/windows-compiler-override.txt @@ -1,16 +1,17 @@ SET (CMAKE_C_FLAGS_INIT "/Wall /FC") SET (CMAKE_C_FLAGS_DEBUG_INIT "/Od /Zi") +SET (CMAKE_C_FLAGS_CHECKED_INIT "/O1 /Zi") SET (CMAKE_C_FLAGS_RELEASE_INIT "/Ox") SET (CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/O2 /Zi") SET (CMAKE_CXX_FLAGS_INIT "/Wall /FC") SET (CMAKE_CXX_FLAGS_DEBUG_INIT "/Od /Zi") +SET (CMAKE_CXX_FLAGS_CHECKED_INIT "/O1 /Zi") SET (CMAKE_CXX_FLAGS_RELEASE_INIT "/Ox") SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/O2 /Zi") -SET (CLR_DEFINES_DEBUG_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1 WRITE_BARRIER_CHECK=1) +SET (CLR_DEFINES_DEBUG_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1) +SET (CLR_DEFINES_CHECKED_INIT DEBUG _DEBUG _DBG URTBLDENV_FRIENDLY=Checked BUILDENV_CHECKED=1) SET (CLR_DEFINES_RELEASE_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) SET (CLR_DEFINES_RELWITHDEBINFO_INIT NDEBUG URTBLDENV_FRIENDLY=Retail) SET (CMAKE_INSTALL_PREFIX $ENV{__CMakeBinDir}) - - |