Complete migration to x86_64-unknown-none

mkroening · mkroening · commit dfc7f63d6296 · 2022-05-12T18:51:19.000+02:00
Replaces remaining uses of x86_64-unknown-hermitkernel
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,5 +1,5 @@
 [alias]
 xtask = "run --package xtask --"
 
-[target.x86_64-unknown-none-hermitkernel]
+[target.x86_64-unknown-none]
 runner = "tests/hermit_test_runner.py"
diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
@@ -30,5 +30,5 @@ jobs:
         env:
           RUSTDOCFLAGS: -D warnings
         run: |
-          cargo doc -Z build-std=core,alloc --package rusty-hermit --no-deps --document-private-items --target targets/x86_64-unknown-none-hermitkernel.json
+          cargo doc -Z build-std=core,alloc --package rusty-hermit --no-deps --document-private-items --target x86_64-unknown-none
           cargo doc -Z build-std=core,alloc --package rusty-hermit --no-deps --document-private-items --target targets/aarch64-unknown-none-hermitkernel.json
diff --git a/.github/workflows/publish_docs.yml b/.github/workflows/publish_docs.yml
@@ -21,10 +21,10 @@ jobs:
           sudo apt-get update
           sudo apt-get install nasm
       - name: Generate documentation
-        run: cargo doc -Zbuild-std=core,alloc --target targets/x86_64-unknown-none-hermitkernel.json --package rusty-hermit
+        run: cargo doc -Zbuild-std=core,alloc --target x86_64-unknown-none --package rusty-hermit
       - name: Generate index.html
         run: |
-          cat > target/x86_64-unknown-none-hermitkernel/doc/index.html <<EOL
+          cat > target/x86_64-unknown-none/doc/index.html <<EOL
           <!doctype html>
           <html>
             <head>
@@ -41,6 +41,6 @@ jobs:
         uses: crazy-max/ghaction-github-pages@v2
         with:
           target_branch: gh-pages
-          build_dir: target/x86_64-unknown-none-hermitkernel/doc
+          build_dir: target/x86_64-unknown-none/doc
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -59,10 +59,10 @@ test:integration:
     - python3 --version
     - HERMIT_LOG_LEVEL_FILTER=Debug cargo test --test '*' --no-fail-fast -Z build-std=core,alloc 
         -Z build-std-features=compiler-builtins-mem --no-default-features --features=pci,acpi 
-        --target targets/x86_64-unknown-none-hermitkernel.json -- --veryverbose
+        --target x86_64-unknown-none -- --veryverbose
     - HERMIT_LOG_LEVEL_FILTER=Debug cargo test --test '*' --no-fail-fast -Z build-std=core,alloc 
         -Z build-std-features=compiler-builtins-mem --no-default-features --features=pci,acpi 
-        --target targets/x86_64-unknown-none-hermitkernel.json -- --num_cores 2
+        --target x86_64-unknown-none -- --num_cores 2
         --veryverbose
   tags:
     - privileged
diff --git a/README.md b/README.md
@@ -30,10 +30,10 @@ rustup component add rust-src llvm-tools-preview
 You can then build `libhermit-rs` with the following command
 
 ```sh
-cargo build -Z build-std=core,alloc,panic_abort --target targets/x86_64-unknown-none-hermitkernel.json
+cargo xtask build --arch x86_64
 ```
 
-The resulting library then can be found in `target/x86_64-unknown-none-hermitkernel/debug/libhermit.a`
+The resulting library then can be found in `target/x86_64/debug/libhermit.a`
 
 
 ### Control the kernel messages verbosity
@@ -44,7 +44,7 @@ You can change it by setting it at compile time to a string matching the name of
 If the variable is not set, or the name doesn't match, then `LevelFilter::Info` is used by default.
 
 ```sh
-$ HERMIT_LOG_LEVEL_FILTER=Debug cargo build -Z build-std=core,alloc,panic_abort --target targets/x86_64-unknown-none-hermitkernel.json
+$ HERMIT_LOG_LEVEL_FILTER=Debug cargo xtask build --arch x86_64
 ```
 
 ## Credits
