From 59447e2dda0a4bbc511376531f9599441d304982 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 19 Mar 2019 11:24:29 -0400
Subject: [PATCH 1/2] Rename eosio-wat2wasm back to orginal name; don't install

eosio-wat2wasm was really the Assemble command from WAVM and we used it for the old wasm build enviroment. It's no longer needed. Remove the rename and install changes effectively reverting ae9388d restoring this back to upstream
---
 libraries/wasm-jit/Source/Programs/Assemble.cpp   | 2 +-
 libraries/wasm-jit/Source/Programs/CMakeLists.txt | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libraries/wasm-jit/Source/Programs/Assemble.cpp b/libraries/wasm-jit/Source/Programs/Assemble.cpp
index a3328794ddd..60ca42cf0f9 100644
--- a/libraries/wasm-jit/Source/Programs/Assemble.cpp
+++ b/libraries/wasm-jit/Source/Programs/Assemble.cpp
@@ -7,7 +7,7 @@ int commandMain(int argc,char** argv)
 {
 	if(argc < 3)
 	{
-		std::cerr << "Usage: eosio-wast2wasm in.wast out.wasm [switches]" << std::endl;
+		std::cerr << "Usage: Assemble in.wast out.wasm [switches]" << std::endl;
 		std::cerr << "  -n|--omit-names\t\tOmits WAST function and local names from the output" << std::endl;
 		return EXIT_FAILURE;
 	}
diff --git a/libraries/wasm-jit/Source/Programs/CMakeLists.txt b/libraries/wasm-jit/Source/Programs/CMakeLists.txt
index 27a3aa427b4..260f4c1092c 100644
--- a/libraries/wasm-jit/Source/Programs/CMakeLists.txt
+++ b/libraries/wasm-jit/Source/Programs/CMakeLists.txt
@@ -1,7 +1,6 @@
-add_executable(eosio-wast2wasm Assemble.cpp CLI.h)
-target_link_libraries(eosio-wast2wasm Logging IR WAST WASM)
-set_target_properties(eosio-wast2wasm PROPERTIES FOLDER Programs)
-INSTALL(TARGETS eosio-wast2wasm DESTINATION ${CMAKE_INSTALL_BINDIR})
+add_executable(Assemble Assemble.cpp CLI.h)
+target_link_libraries(Assemble Logging IR WAST WASM)
+set_target_properties(Assemble PROPERTIES FOLDER Programs)
 
 add_executable(Disassemble Disassemble.cpp CLI.h)
 target_link_libraries(Disassemble Logging IR WAST WASM)

From 96f6ee165cbacfd9b598e1af248bd9eda2ec3733 Mon Sep 17 00:00:00 2001
From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com>
Date: Tue, 19 Mar 2019 11:56:50 -0400
Subject: [PATCH 2/2] Don't build WAVM tools any longer

Some of these don't work as intended due to changes in WAVM to support EOSIO
---
 libraries/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
index a40355971a9..39d0398305d 100644
--- a/libraries/CMakeLists.txt
+++ b/libraries/CMakeLists.txt
@@ -2,7 +2,7 @@ add_subdirectory( fc )
 add_subdirectory( builtins )
 add_subdirectory( softfloat )
 add_subdirectory( chainbase )
-add_subdirectory( wasm-jit )
+add_subdirectory( wasm-jit EXCLUDE_FROM_ALL )
 add_subdirectory( appbase )
 add_subdirectory( chain )
 add_subdirectory( testing )