diff --git a/.appveyor.yml b/.appveyor.yml index 46c989086..dec078c91 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,21 +17,21 @@ cache: - target install: - # Install LLVM - - mkdir 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 - - 7z x llvm.exe -oC:\projects\deps\llvm - # - set "PATH=%PATH%;C:\projects\deps\llvm\bin" - - set "LLD_LINK=C:\projects\deps\llvm\bin\lld-link.exe" - - set "LLVM_SYS_70_PREFIX=C:\projects\deps\llvm" - - cd "%APPVEYOR_BUILD_FOLDER%" + # # Install LLVM + # - mkdir 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 + # - 7z x llvm.exe -oC:\projects\deps\llvm + # # - set "PATH=%PATH%;C:\projects\deps\llvm\bin" + # - set "LLD_LINK=C:\projects\deps\llvm\bin\lld-link.exe" + # - set "LLVM_SYS_70_PREFIX=C:\projects\deps\llvm" + # - cd "%APPVEYOR_BUILD_FOLDER%" # Install Rust # 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 # - 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 update - rustc -vV diff --git a/lib/llvm-backend/Cargo.toml b/lib/llvm-backend/Cargo.toml index a3290f3fd..1dbb63a96 100644 --- a/lib/llvm-backend/Cargo.toml +++ b/lib/llvm-backend/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" [dependencies] wasmer-runtime-core = { path = "../runtime-core", version = "0.2.1" } wasmparser = "0.28.0" -inkwell = { git = "https://github.com/TheDan64/inkwell", branch = "llvm7-0" } hashbrown = "0.1.8" smallvec = "0.6.8" goblin = "0.0.20" @@ -15,6 +14,12 @@ libc = "0.2.49" nix = "0.13.0" 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] cc = "1.0" lazy_static = "1.2.0"