summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authornatrixaeria <upezu@student.kit.edu>2019-10-25 04:07:23 +0200
committernatrixaeria <upezu@student.kit.edu>2019-10-25 04:07:23 +0200
commit1193925cd231ed15a48f9f34c0fab8101aa5c820 (patch)
treecab75791c3062d7b3f087b5959fa7f52cfa63d4f /kernel
parent93490e27ad5b924f191fbf15f09d79354e37ca73 (diff)
Do not build start asm twice
Diffstat (limited to 'kernel')
-rwxr-xr-xkernel/build.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/build.sh b/kernel/build.sh
index 14a864f..4a8130b 100755
--- a/kernel/build.sh
+++ b/kernel/build.sh
@@ -25,9 +25,8 @@ cleanup_temp() {
build_kernel_elf() {
create_target
for f in $ASM_PATH/*.asm; do
- nasm -felf64 "$f" -o $OBJ_PATH/"$(basename $f)".o
+ nasm -felf64 "$f" -o $OBJ_PATH/"$(basename -s .asm $f)".o
done
- nasm -felf64 $ASM_PATH/boot.asm -o $OBJ_PATH/boot.o
ld -n -o $TARGET_PATH/kernel.bin -T $LINK_SCRIPT_PATH/linker.ld $OBJ_PATH/*.o
cleanup_temp
}