build: Try using lld as the linker for certain things

oasisprotocol · Jun 29, 2021 · 4031355 · 4031355
1 parent 76f6fff
commit 4031355
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.buildkite/code.pipeline.yml b/.buildkite/code.pipeline.yml
@@ -141,8 +141,9 @@ steps:
   ####################
   # Runtime build jobs
   ####################
-  - label: Build key manager runtime
+  - label: Build key manager and runtime
     command:
+      - export RUSTFLAGS="-C link-arg=-fuse-ld=lld"
       - .buildkite/rust/build_runtime.sh tests/runtimes/simple-keymanager
       - .buildkite/rust/build_runtime.sh tests/runtimes/simple-keyvalue
 
@@ -168,6 +169,7 @@ steps:
   - label: Test Rust crates
     command:
       # Build storage interoperability test helpers first.
+      - export RUSTFLAGS="-C link-arg=-fuse-ld=lld"
       - make build-helpers
       - export OASIS_STORAGE_PROTOCOL_SERVER_BINARY=$(realpath go/storage/mkvs/interop/mkvs-test-helpers)
       - .buildkite/rust/test_generic.sh .

diff --git a/.buildkite/rust/coverage.sh b/.buildkite/rust/coverage.sh
@@ -37,7 +37,7 @@ set -x
 export CARGO_TARGET_DIR=/tmp/coverage_target
 
 # Required as tarpaulin doesn't honor .cargo/config.
-export RUSTFLAGS="-C target-feature=+aes,+ssse3"
+export RUSTFLAGS="$RUSTFLAGS -C target-feature=+aes,+ssse3"
 
 # Name the current commit so Tarpaulin can detect it correctly.
 git checkout -B ${BUILDKITE_BRANCH}

diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
@@ -16,7 +16,7 @@ ARG JEMALLOC_CHECKSUM=34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -qq && apt-get upgrade -qq && apt-get install -qq \
-    build-essential git gdb cmake \
+    build-essential git gdb cmake lld \
     curl wget unzip \
     pkg-config software-properties-common \
     python python-pyelftools \