Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

remove eosio-wat2wasm and other WAVM tools from being built #6968

Merged
merged 2 commits into from
Mar 20, 2019
+5 −6
Merged

remove eosio-wat2wasm and other WAVM tools from being built #6968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59447e2
Rename eosio-wat2wasm back to orginal name; don't install
spoonincode Mar 19, 2019
96f6ee1
Don't build WAVM tools any longer
spoonincode Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion libraries/wasm-jit/Source/Programs/Assemble.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
7 changes: 3 additions & 4 deletions libraries/wasm-jit/Source/Programs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down