From e108f8bd97c04047c9dd196ee1366627db6d1a6c Mon Sep 17 00:00:00 2001 From: vanten-s Date: Tue, 26 Mar 2024 20:45:04 +0100 Subject: [PATCH] Removed unnecesary code --- Makefile | 1 - kernel/.cargo/config.toml | 3 --- shell.nix | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index d2477a1..c882b00 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ all: build build: rm -rf build - rm -rf kernel/target mkdir build i686-elf-as -o build/boot.o boot.s cd kernel; cargo build diff --git a/kernel/.cargo/config.toml b/kernel/.cargo/config.toml index 9b79ad8..0d78396 100644 --- a/kernel/.cargo/config.toml +++ b/kernel/.cargo/config.toml @@ -4,6 +4,3 @@ target = "i686-unknown-bare.json" [unstable] build-std-features = ["compiler-builtins-mem"] build-std = ["core", "compiler_builtins"] - -[target."i686-unknown-bare"] -linker = "i686-elf-gcc" diff --git a/shell.nix b/shell.nix index 27bbc42..a28913e 100644 --- a/shell.nix +++ b/shell.nix @@ -1,8 +1,6 @@ { pkgs ? import {} }: -let - crossPkgs = pkgs.pkgsCross.aarch64-multiplatform; -in pkgs.mkShell rec { +pkgs.mkShell rec { buildInputs = with pkgs; [ clang llvmPackages_17.bintools