about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Huss <eric@huss.org>2020-06-04 14:32:23 -0700
committerEric Huss <eric@huss.org>2020-06-04 14:32:23 -0700
commite6582006e8e8959ba412a2117cdd5baec2638f6e (patch)
tree4d765fa909b8fdb3937d50690204fc85003fef15
parent860b381793690247800def81e3031a4d33b7e07c (diff)
downloadrust-e6582006e8e8959ba412a2117cdd5baec2638f6e.tar.gz
rust-e6582006e8e8959ba412a2117cdd5baec2638f6e.zip
Enable lld for Cargo tests on Windows.
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--src/ci/azure-pipelines/auto.yml2
-rw-r--r--src/ci/github-actions/ci.yml2
3 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 291dbf60361..c3c95226aeb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -442,7 +442,7 @@ jobs:
           - name: x86_64-msvc-cargo
             env:
               SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
-              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc"
+              RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld"
               VCVARS_BAT: vcvars64.bat
               NO_DEBUG_ASSERTIONS: 1
               NO_LLVM_ASSERTIONS: 1
diff --git a/src/ci/azure-pipelines/auto.yml b/src/ci/azure-pipelines/auto.yml
index 46d3cf7a38c..f8fa7b727d1 100644
--- a/src/ci/azure-pipelines/auto.yml
+++ b/src/ci/azure-pipelines/auto.yml
@@ -148,7 +148,7 @@ jobs:
         INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
       x86_64-msvc-cargo:
         SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
-        INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
+        INITIAL_RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
         VCVARS_BAT: vcvars64.bat
         # FIXME(#59637)
         NO_DEBUG_ASSERTIONS: 1
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 1c120f81634..92fec593a54 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -505,7 +505,7 @@ jobs:
           - name: x86_64-msvc-cargo
             env:
               SCRIPT: python x.py test src/tools/cargotest src/tools/cargo
-              RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc
+              RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
               VCVARS_BAT: vcvars64.bat
               # FIXME(#59637)
               NO_DEBUG_ASSERTIONS: 1