From ecdc00d569e5f53b2dac125ea04c85e68e0ae595 Mon Sep 17 00:00:00 2001 From: Daniel Kirchner Date: Fri, 7 Dec 2018 11:36:54 +0100 Subject: [PATCH 1/2] Set emscripten to strict mode (wrt deprecated compiler options). --- cmake/EthCompilerSettings.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake index c45ecba66..252e3ae17 100644 --- a/cmake/EthCompilerSettings.cmake +++ b/cmake/EthCompilerSettings.cmake @@ -98,6 +98,8 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA # Abort if linking results in any undefined symbols # Note: this is on by default in the CMake Emscripten module which we aren't using set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ERROR_ON_UNDEFINED_SYMBOLS=1") + # Disallow deprecated emscripten build options. + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s STRICT=1") add_definitions(-DETH_EMSCRIPTEN=1) endif() endif() From 3f58505c76acf3f2ffe2c171aa1332a3eea02990 Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Thu, 17 Jan 2019 15:23:19 +0000 Subject: [PATCH 2/2] Remove obsolete ETH_EMSCRIPTEN option This was made obsolete by using toolchain files (#2836) --- cmake/EthCompilerSettings.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake index 252e3ae17..8ffdfeb03 100644 --- a/cmake/EthCompilerSettings.cmake +++ b/cmake/EthCompilerSettings.cmake @@ -100,7 +100,6 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ERROR_ON_UNDEFINED_SYMBOLS=1") # Disallow deprecated emscripten build options. set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s STRICT=1") - add_definitions(-DETH_EMSCRIPTEN=1) endif() endif()