From 6cd46e8da82718c05fd6cc7e270f4bc17b1ffc25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <mkroening@posteo.net>
Date: Thu, 17 Nov 2022 19:06:41 +0100
Subject: [PATCH] Omit implicit core,alloc from build-std
---
.github/workflows/ci.yml | 8 ++++----
.gitlab-ci.yml | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a334b1604..6eed3dfb8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -120,7 +120,7 @@ jobs:
run: rustup show
- uses: Swatinem/rust-cache@v2
- name: Build dev profile
- run: cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit
+ run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit
- name: Download loader
uses: dsaltares/fetch-gh-release-asset@1.1.0
with:
@@ -134,7 +134,7 @@ jobs:
-kernel rusty-loader-x86_64 \
-initrd target/x86_64-unknown-hermit/debug/rusty_demo
- name: Build release profile
- run: cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --release
+ run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --release
- name: Test release profile
run: |
qemu-system-x86_64 -display none -smp 1 -m 128M -serial stdio \
@@ -143,7 +143,7 @@ jobs:
-kernel rusty-loader-x86_64 \
-initrd target/x86_64-unknown-hermit/release/rusty_demo
- name: Build minimal profile
- run: cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --no-default-features --release --package hello_world
+ run: cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --no-default-features --release --package hello_world
- name: Test minimal profile
id: minimal
run: |
@@ -196,7 +196,7 @@ jobs:
run: rustup show
- uses: Swatinem/rust-cache@v2
- name: Build dev profile
- run: cargo build -Zbuild-std=core,alloc,std,panic_abort --target aarch64-unknown-hermit --package hello_world
+ run: cargo build -Zbuild-std=std,panic_abort --target aarch64-unknown-hermit --package hello_world
- run: rustup toolchain install nightly-2022-08-01 --target aarch64-unknown-none-softfloat --component llvm-tools-preview
- name: Build loader
run: cargo +nightly-2022-08-01 xtask build --target aarch64
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae4aa374e..815d14615 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,8 +41,8 @@ build:demo:
- if [ -d "libhermit-rs" ]; then rm -rf libhermit-rs; fi
- mkdir libhermit-rs
- shopt -s dotglob nullglob && mv $HOME/tmp_libhermit-rs/* libhermit-rs/.
- - cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
- - cargo build -Zbuild-std=core,alloc,std,panic_abort --target x86_64-unknown-hermit --package rusty_demo --release
+ - cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo
+ - cargo build -Zbuild-std=std,panic_abort --target x86_64-unknown-hermit --package rusty_demo --release
artifacts:
paths:
- rusty-hermit/target/x86_64-unknown-hermit/debug/rusty_demo
--
GitLab