Re-enable llvm build in appveyor

.appveyor.yml

@@ -20,20 +20,23 @@ cache:
 
 install:
   # # Install LLVM
-  # - mkdir C:\projects\deps
-  # - cd C:\projects\deps
+  - mkdir C:\projects\deps
+  - cd C:\projects\deps
+  - appveyor DownloadFile https://github.com/bjfish/build-llvm-for-appveyor/releases/download/0.3/llvm-7.0.1-install.zip -FileName llvm-7.0.1-install.zip
   # - appveyor DownloadFile http://prereleases.llvm.org/win-snapshots/LLVM-7.0.0-r336178-win64.exe -FileName llvm.exe
+  - 7z x llvm-7.0.1-install.zip
   # - 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%"
+  - C:\projects\deps\llvm-7.0.1-install\bin\llvm-config.exe --version
+  - set "LLVM_SYS_70_PREFIX=C:\projects\deps\llvm-7.0.1-install"
+  - 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:\\Libraries\\llvm-5.0.0\\bin;%USERPROFILE%\.cargo\bin
+  - appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
+  - rustup-init.exe -yv --default-host %target%
+  - set PATH=%PATH%;%USERPROFILE%\.cargo\bin
   - rustup default stable-%target%
   - rustup update
   - rustc -vV
@@ -51,6 +54,7 @@ build_script:
 
 test_script:
   - cargo test --manifest-path lib/spectests/Cargo.toml --features clif
+  - cargo test --manifest-path lib/spectests/Cargo.toml --features llvm
 
 before_deploy:
   - cd ./src/installer

Cargo.toml

@@ -25,10 +25,9 @@ wasmer-clif-backend = { path = "lib/clif-backend" }
 wasmer-runtime = { path = "lib/runtime" }
 wasmer-runtime-core = { path = "lib/runtime-core" }
 wasmer-emscripten = { path = "lib/emscripten" }
-
-[target.'cfg(not(windows))'.dependencies]
 wasmer-llvm-backend = { path = "lib/llvm-backend", optional = true }
 
+
 [workspace]
 members = ["lib/clif-backend", "lib/runtime", "lib/runtime-core", "lib/emscripten", "lib/spectests", "lib/win-exception-handler", "lib/runtime-c-api", "lib/llvm-backend"]
 

lib/emscripten/Cargo.toml

@@ -21,8 +21,6 @@ rand = "0.6"
 [dev-dependencies]
 wasmer-clif-backend = { path = "../clif-backend", version = "0.2.0" }
 wabt = "0.7.2"
-
-[target.'cfg(not(windows))'.dev-dependencies]
 wasmer-llvm-backend = { path = "../llvm-backend", version = "0.1.0" }
 
 [build-dependencies]

lib/runtime/Cargo.toml

@@ -25,7 +25,7 @@ tempfile = "3.0.7"
 criterion = "0.2"
 wabt = "0.7.4"
 
-[target.'cfg(not(windows))'.dependencies.wasmer-llvm-backend]
+[dependencies.wasmer-llvm-backend]
 path = "../llvm-backend"
 optional = true
 

lib/spectests/Cargo.toml

@@ -10,6 +10,7 @@ build = "build/mod.rs"
 
 [dependencies]
 wasmer-runtime-core = { path = "../runtime-core", version = "0.2.0" }
+wasmer-llvm-backend = { path = "../llvm-backend", version = "0.1.0", optional = true }
 
 [build-dependencies]
 wabt = "0.7.2"
@@ -18,8 +19,6 @@ wabt = "0.7.2"
 wasmer-clif-backend = { path = "../clif-backend", version = "0.2.0" }
 wabt = "0.7.2"
 
-[target.'cfg(not(windows))'.dependencies]
-wasmer-llvm-backend = { path = "../llvm-backend", version = "0.1.0", optional = true }
 
 [features]
 default = ["fast-tests"]