CMake: Remove ETH_RELEASE

ShifaSZ · Dec 5, 2017 · 2b8cb68 · 2b8cb68
1 parent 73957cb
commit 2b8cb68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
@@ -37,9 +37,9 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 
 	# Configuration-specific compiler settings.
 	set(CMAKE_CXX_FLAGS_DEBUG          "-Og -g -DETH_DEBUG")
-	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG -DETH_RELEASE")
-	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG -DETH_RELEASE")
-	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DETH_RELEASE")
+	set(CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG")
+	set(CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
 
 	option(USE_LD_GOLD "Use GNU gold linker" ON)
 	if (USE_LD_GOLD)

diff --git a/libethereum/Block.cpp b/libethereum/Block.cpp
@@ -464,10 +464,8 @@ u256 Block::enact(VerifiedBlockRef const& _block, BlockChain const& _bc)
 	DEV_TIMED_FUNCTION_ABOVE(500);
 
 	// m_currentBlock is assumed to be prepopulated and reset.
-#if !ETH_RELEASE
 	assert(m_previousBlock.hash() == _block.info.parentHash());
 	assert(m_currentBlock.parentHash() == _block.info.parentHash());
-#endif
 
 	if (m_currentBlock.parentHash() != m_previousBlock.hash())
 		// Internal client error.