Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Emscripten 3.1.26 single-threaded #206

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

NorrinRadd
Copy link

Partially resolves #144

@NorrinRadd NorrinRadd changed the title Emscripten 3.1.26 Upgrade to Emscripten 3.1.26 single-threaded Apr 21, 2024
Copy link
Owner

@woodser woodser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm getting an error building with this PR and my proposed changes below:

em++: error: using 64-bit arguments in EM_JS function without WASM_BIGINT is not yet fully supported:

@@ -280,7 +279,7 @@ EMCC_LINKER_FLAGS_BASE
# unsure if the -I...boost..include is necessary here due to include above
# TODO? does EXPORT_NAME need to be the same for both targets? (or should it be set per-target with …_WASM, …_ASMJS?)

"-Wall -Werror -Wl,--allow-undefined -std=c++14 -Oz \
"-Wall -Wl,--allow-undefined -std=c++14 -Oz \
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to add this change when I was testing recent versions of emscripten, but maybe the change can be removed with 3.1.26, so -Werror is included?

@@ -241,7 +241,6 @@ set(
${MONERO_PROJECT_SRC}/wallet/message_store.cpp
${MONERO_PROJECT_SRC}/wallet/message_transporter.cpp
${MONERO_PROJECT_SRC}/wallet/node_rpc_proxy.cpp
${MONERO_PROJECT_SRC}/wallet/wallet_rpc_payments.cpp
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is present in the release-v0.18 branch, which is what monero-ts is built on: https://github.com/monero-project/monero/blob/release-v0.18/src/wallet/wallet_rpc_payments.cpp

@@ -34,7 +34,7 @@ namespace epee
bool is_connected(bool *ssl = NULL) override;
bool invoke(const boost::string_ref uri, const boost::string_ref method, const boost::string_ref body, std::chrono::milliseconds timeout, const http_response_info** ppresponse_info = NULL, const fields_list& additional_params = fields_list()) override;
bool invoke_get(const boost::string_ref uri, std::chrono::milliseconds timeout, const string& body = string(), const http_response_info** ppresponse_info = NULL, const fields_list& additional_params = fields_list()) override;
bool invoke_post(const boost::string_ref uri, const string& body, std::chrono::milliseconds timeout, const http_response_info** ppresponse_info = NULL, const fields_list& additional_params = fields_list()) override;
bool invoke_post(const boost::string_ref uri, const string& body, std::chrono::milliseconds timeout, const http_response_info** ppresponse_info = NULL, const fields_list& additional_params = fields_list());
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this change is not necessary when built against the release-v0.18 branch, so can be removed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update emscripten [2 XMR]
2 participants