Use LLVM 5 for Windows

This commit is contained in:
Syrus
2019-03-07 18:06:47 -08:00
parent 679fdc14c2
commit 671ff09e6a
2 changed files with 16 additions and 11 deletions

View File

@ -17,21 +17,21 @@ cache:
- target - target
install: install:
# Install LLVM # # Install LLVM
- mkdir C:\projects\deps # - mkdir C:\projects\deps
- cd C:\projects\deps # - cd C:\projects\deps
- appveyor DownloadFile http://prereleases.llvm.org/win-snapshots/LLVM-7.0.0-r336178-win64.exe -FileName llvm.exe # - appveyor DownloadFile http://prereleases.llvm.org/win-snapshots/LLVM-7.0.0-r336178-win64.exe -FileName llvm.exe
- 7z x llvm.exe -oC:\projects\deps\llvm # - 7z x llvm.exe -oC:\projects\deps\llvm
# - set "PATH=%PATH%;C:\projects\deps\llvm\bin" # # - set "PATH=%PATH%;C:\projects\deps\llvm\bin"
- set "LLD_LINK=C:\projects\deps\llvm\bin\lld-link.exe" # - set "LLD_LINK=C:\projects\deps\llvm\bin\lld-link.exe"
- set "LLVM_SYS_70_PREFIX=C:\projects\deps\llvm" # - set "LLVM_SYS_70_PREFIX=C:\projects\deps\llvm"
- cd "%APPVEYOR_BUILD_FOLDER%" # - cd "%APPVEYOR_BUILD_FOLDER%"
# Install Rust # Install Rust
# uncomment these lines if the cache is cleared, or if we must re-install rust for some reason # uncomment these lines if the cache is cleared, or if we must re-install rust for some reason
# - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe # - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
# - rustup-init.exe -yv --default-host %target% # - rustup-init.exe -yv --default-host %target%
- set PATH=%PATH%;C:\\projects\\deps\\llvm\\bin;%USERPROFILE%\.cargo\bin - set PATH=%PATH%;C:\\Libraries\\llvm-5.0.0\\bin;%USERPROFILE%\.cargo\bin
- rustup default stable-%target% - rustup default stable-%target%
- rustup update - rustup update
- rustc -vV - rustc -vV

View File

@ -7,7 +7,6 @@ edition = "2018"
[dependencies] [dependencies]
wasmer-runtime-core = { path = "../runtime-core", version = "0.2.1" } wasmer-runtime-core = { path = "../runtime-core", version = "0.2.1" }
wasmparser = "0.28.0" wasmparser = "0.28.0"
inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "llvm7-0" }
hashbrown = "0.1.8" hashbrown = "0.1.8"
smallvec = "0.6.8" smallvec = "0.6.8"
goblin = "0.0.20" goblin = "0.0.20"
@ -15,6 +14,12 @@ libc = "0.2.49"
nix = "0.13.0" nix = "0.13.0"
capstone = { version = "0.5.0", optional = true } capstone = { version = "0.5.0", optional = true }
[target.'cfg(windows)'.dependencies]
inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "llvm5-0" }
[target.'cfg(not(windows))'.dependencies]
inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "llvm7-0" }
[build-dependencies] [build-dependencies]
cc = "1.0" cc = "1.0"
lazy_static = "1.2.0" lazy_static = "1.2.0"