From e436788ee30311f4bf17125fed800afd9fd26190 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Mon, 1 Feb 2021 10:03:32 -0800 Subject: [PATCH 1/4] Update to latest inkwell. --- lib/compiler-llvm/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compiler-llvm/Cargo.toml b/lib/compiler-llvm/Cargo.toml index 0baf3ae75c7..027b757a11a 100644 --- a/lib/compiler-llvm/Cargo.toml +++ b/lib/compiler-llvm/Cargo.toml @@ -24,7 +24,7 @@ itertools = "0.9" rayon = "1.5" [dependencies.inkwell] -version = "=0.1.0-llvm10sample" +version = "=0.1.0-beta.2" default-features = false features = ["llvm10-0", "target-x86", "target-aarch64"] From d247dc088d19832c8ee6f4c105f4802e2609bc60 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Mon, 1 Feb 2021 10:04:34 -0800 Subject: [PATCH 2/4] Bump to llvm 11! --- lib/compiler-llvm/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compiler-llvm/Cargo.toml b/lib/compiler-llvm/Cargo.toml index 027b757a11a..9ca253b50ee 100644 --- a/lib/compiler-llvm/Cargo.toml +++ b/lib/compiler-llvm/Cargo.toml @@ -26,7 +26,7 @@ rayon = "1.5" [dependencies.inkwell] version = "=0.1.0-beta.2" default-features = false -features = ["llvm10-0", "target-x86", "target-aarch64"] +features = ["llvm11-0", "target-x86", "target-aarch64"] [build-dependencies] cc = "1.0" From ed0b3cb2abeecd5d2cab8741e9d2a665b9f43f76 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Mon, 1 Feb 2021 10:17:53 -0800 Subject: [PATCH 3/4] Update Cargo.lock too. --- Cargo.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 164458639f0..33805ac77e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -971,9 +971,9 @@ dependencies = [ [[package]] name = "inkwell" -version = "0.1.0-llvm10sample" +version = "0.1.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e079c12273d96e41481454a37ad968e607e1ce51b39b9facd3a802a12df6e9dc" +checksum = "f5fe0be1e47c0c0f3da4397693e08f5d78329ae095c25d529e12ade78420fb41" dependencies = [ "either", "inkwell_internals", @@ -986,9 +986,9 @@ dependencies = [ [[package]] name = "inkwell_internals" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22cf4eda09069b48204cce4b7cd9a25311da813780e95a038524f2210fab44e" +checksum = "c2e1f71330ccec54ee62533ae88574c4169b67fb4b95cbb1196a1322582abd11" dependencies = [ "proc-macro2", "quote", @@ -1128,15 +1128,15 @@ dependencies = [ [[package]] name = "llvm-sys" -version = "100.2.0" +version = "110.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9109e19fbfac3458f2970189719fa19f1007c6fd4e08c44fdebf4be0ddbe261d" +checksum = "b0062a0c6635fb5d57c6ebba072dcae50e41651030363cf06d220b0d016840f2" dependencies = [ "cc", "lazy_static", "libc", "regex", - "semver 0.9.0", + "semver 0.11.0", ] [[package]] From 2e2bee5ae2e6b3c36465db0ad74187b08b8dec29 Mon Sep 17 00:00:00 2001 From: Nick Lewycky Date: Mon, 1 Feb 2021 12:26:07 -0800 Subject: [PATCH 4/4] Move to LLVM 11 on the CI. --- .github/workflows/main.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c9295b377d2..ca01d29e491 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -43,14 +43,14 @@ jobs: - build: linux-x64 os: ubuntu-18.04 rust: 1.48 - llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/10.x/linux-amd64.tar.gz' + llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/11.x/linux-amd64.tar.gz' artifact_name: 'wasmer-linux-amd64' cross_compilation_artifact_name: 'cross_compiled_from_linux' run_integration_tests: true - build: macos-x64 os: macos-latest rust: 1.48 - llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/10.x/darwin-amd64.tar.gz' + llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/11.x/darwin-amd64.tar.gz' artifact_name: 'wasmer-darwin-amd64' cross_compilation_artifact_name: 'cross_compiled_from_mac' run_integration_tests: true @@ -62,7 +62,7 @@ jobs: - build: windows-x64 os: windows-latest rust: 1.48 - # llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/10.x/windows-amd64.tar.gz' + # llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/11.x/windows-amd64.tar.gz' artifact_name: 'wasmer-windows-amd64' cross_compilation_artifact_name: 'cross_compiled_from_win' run_integration_tests: true @@ -70,7 +70,7 @@ jobs: os: [self-hosted, linux, ARM64] random_sccache_port: true rust: 1.48 - llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/10.x/linux-aarch64.tar.gz' + llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/11.x/linux-aarch64.tar.gz' artifact_name: 'wasmer-linux-aarch64' run_integration_tests: false env: @@ -108,9 +108,9 @@ jobs: mkdir ${{ env.LLVM_DIR }} tar xf llvm.tar.gz --strip-components=1 -C ${{ env.LLVM_DIR }} echo "${{ env.LLVM_DIR }}/bin" >> $GITHUB_PATH - echo "LLVM_SYS_100_PREFIX=${{ env.LLVM_DIR }}" >> $GITHUB_ENV + echo "LLVM_SYS_110_PREFIX=${{ env.LLVM_DIR }}" >> $GITHUB_ENV env: - LLVM_DIR: ${{ github.workspace }}/llvm-10 + LLVM_DIR: ${{ github.workspace }}/llvm-11 - name: Set up dependencies for Mac OS run: | brew install automake