Merge pull request #3834 from EOSIO/fix-3824

Prevent inclusion of local build system paths into wasm
EOSIO · Jun 5, 2018 · 52da8d5 · 52da8d5
2 parents a97a49a + 5f6842a
commit 52da8d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CMakeModules/wasm.cmake b/CMakeModules/wasm.cmake
@@ -54,7 +54,7 @@ macro(compile_wast)
     endif()
 
     set(WASM_COMMAND ${WASM_CLANG} -emit-llvm -O3 ${STDFLAG} --target=wasm32 -ffreestanding
-              -nostdlib -nostdlibinc -fno-threadsafe-statics -fno-rtti -fno-exceptions  
+              -nostdlib -nostdlibinc -DBOOST_DISABLE_ASSERTS -DBOOST_EXCEPTION_DISABLE -fno-threadsafe-statics -fno-rtti -fno-exceptions
               -c ${infile} -o ${outfile}.bc
     )
     if (${ARG_NOWARNINGS})

diff --git a/tools/eosiocpp.in b/tools/eosiocpp.in
@@ -40,6 +40,7 @@ function build_contract {
         filePath=`dirname $file`
 
         ($PRINT_CMDS; @WASM_CLANG@ -emit-llvm -O3 --std=c++14 --target=wasm32 -nostdinc \
+                                   -DBOOST_DISABLE_ASSERTS -DBOOST_EXCEPTION_DISABLE \
                                    -nostdlib -nostdlibinc -ffreestanding -nostdlib -fno-threadsafe-statics -fno-rtti \
                                    -fno-exceptions -I ${EOSIO_INSTALL_DIR}/include \
                                    -I${EOSIO_INSTALL_DIR}/include/libc++/upstream/include \