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

Update code to work with nightly 2016-06-04 #8

Merged
merged 1 commit into from
Jun 17, 2016
Merged

Update code to work with nightly 2016-06-04 #8

merged 1 commit into from
Jun 17, 2016

Conversation

badboy
Copy link

@badboy badboy commented Jun 17, 2016

I tested this with nightly 2016-06-04.
It currently does not work with the latest nightly. Too much changed and some structs are now private. Need to find a way around that (besides ugly transmuting).

I also had to change binaryen to compile to static:

diff --git i/CMakeLists.txt w/CMakeLists.txt
index f3f11d1..28e33e4 100644
--- i/CMakeLists.txt
+++ w/CMakeLists.txt
@@ -98,7 +98,7 @@ SET(binaryen_SOURCES
   src/cfg/Relooper.cpp
   src/wasm.cpp
 )
-ADD_LIBRARY(binaryen SHARED ${binaryen_SOURCES})
+ADD_LIBRARY(binaryen STATIC ${binaryen_SOURCES})
 TARGET_LINK_LIBRARIES(binaryen asmjs ${all_passes} support)

 SET(binaryen-shell_SOURCES

@badboy
Copy link
Author

badboy commented Jun 17, 2016

cc @eholk

@brson brson merged commit d50518a into brson:master Jun 17, 2016
@brson
Copy link
Owner

brson commented Jun 17, 2016

Thanks! cc @kripken

@eholk
Copy link
Collaborator

eholk commented Jun 17, 2016

Is there a way to set rustup to fetch a specific nightly version? It'd be nice if rustup udpate just automatically got the right one.

@lqd
Copy link
Collaborator

lqd commented Jun 17, 2016

Besides modifying binaryen to compile to a static lib, it also works by changing mir2wasm's build.rs to link dynamically to it, with "dylib=binaryen" instead of "static=binaryen"

@badboy
Copy link
Author

badboy commented Jun 18, 2016

@eholk: rustup toolchain install nightly-2016-05-04

@brson
Copy link
Owner

brson commented Jun 20, 2016

@eholk There's not yet a way to encode that information in the project's source like with rbenv.

@lqd lqd mentioned this pull request Jun 24, 2016
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.

4 participants