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

Export license in jsonCompiler and add tests #2583

Merged
merged 2 commits into from
Jul 18, 2017
Merged

Export license in jsonCompiler and add tests #2583

merged 2 commits into from
Jul 18, 2017

Conversation

axic
Copy link
Member

@axic axic commented Jul 18, 2017

The makefile change was missed in #2395.

Copy link
Member

@pirapira pirapira left a comment

Choose a reason for hiding this comment

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

Looks like a good idea.

@@ -18,7 +18,7 @@ else()
endif()

if (EMSCRIPTEN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_version\",\"_compileJSONMulti\",\"_compileJSONCallback\",\"_compileStandard\"]' -s RESERVED_FUNCTION_POINTERS=20")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_license\",\"_version\",\"_compileJSONMulti\",\"_compileJSONCallback\",\"_compileStandard\"]' -s RESERVED_FUNCTION_POINTERS=20")
Copy link
Member Author

Choose a reason for hiding this comment

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

This part is actually a bug fix (was missed in #2395). Found out via ethereum/solc-js#121

@axic axic force-pushed the soljson-license branch 2 times, most recently from a024245 to 6e4150a Compare July 18, 2017 14:28
@axic axic merged commit 0eab808 into develop Jul 18, 2017
@axic axic deleted the soljson-license branch July 18, 2017 15:02
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.

None yet

2 participants