File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -254,7 +254,7 @@ steps:
254254 # Needed as the trust-root test rebuilds the enclave with embedded trust root data.
255255 - cargo install --locked --path tools
256256 - export CFLAGS_x86_64_fortanix_unknown_sgx="-isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening"
257- - export CC_x86_64_fortanix_unknown_sgx=clang-11
257+ - export CC_x86_64_fortanix_unknown_sgx=clang-18
258258 # Only run runtime scenarios as others do not use SGX.
259259 - >
260260 .buildkite/scripts/test_e2e.sh --timeout 20m
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ pushd $src_dir
5858
5959 # Build SGX runtime.
6060 export CFLAGS_x86_64_fortanix_unknown_sgx=" -isystem/usr/include/x86_64-linux-gnu -mlvi-hardening -mllvm -x86-experimental-lvi-inline-asm-hardening"
61- export CC_x86_64_fortanix_unknown_sgx=clang-11
61+ export CC_x86_64_fortanix_unknown_sgx=clang-18
6262 unset OASIS_UNSAFE_SKIP_KM_POLICY
6363 CARGO_TARGET_DIR=" ${CARGO_TARGET_DIR} /sgx" cargo build --release --locked --target x86_64-fortanix-unknown-sgx
6464 CARGO_TARGET_DIR=" ${CARGO_TARGET_DIR} /sgx" cargo elf2sgxs --release
Original file line number Diff line number Diff line change @@ -16,11 +16,12 @@ build-tools:
1616 @$(ECHO ) " $( MAGENTA) *** Building Rust tools...$( OFF) "
1717 @CARGO_TARGET_DIR=target/default cargo install --locked --path tools
1818
19- # NOTE: We explictly set CARGO_TARGET_DIR as a workaround to avoid
19+ # NOTE: We explicitly set CARGO_TARGET_DIR as a workaround to avoid
2020# recompilations in newer cargo nightly builds.
2121# See https://github.com/oasisprotocol/oasis-core/pull/2673 for details.
2222build-runtimes :
23- @CARGO_TARGET_ROOT=$(shell pwd) /target && for e in $( RUNTIMES) ; do \
23+ @export CC_x86_64_fortanix_unknown_sgx=clang-18 && \
24+ CARGO_TARGET_ROOT=$(shell pwd) /target && for e in $( RUNTIMES) ; do \
2425 $(ECHO ) " $( MAGENTA) *** Building runtime: $$ e...$( OFF) " ; \
2526 (cd $$ e && \
2627 CARGO_TARGET_DIR=$$ {CARGO_TARGET_ROOT}/sgx cargo build --release --target x86_64-fortanix-unknown-sgx && \
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ ARG LEGACY_GO_VERSION=1.20.2
2020ARG DEBIAN_FRONTEND=noninteractive
2121
2222RUN apt-get update -qq && apt-get upgrade -qq && apt-get install -qq \
23- build-essential git gdb cmake clang-11 gcc-multilib \
23+ build-essential git gdb cmake clang-18 gcc-multilib \
2424 curl wget unzip \
2525 pkg-config software-properties-common \
2626 python3 python3-pyelftools \
You can’t perform that action at this time.
0 commit comments