From fbe1e23e97bf380ed187da88cba1ed075c5e435f Mon Sep 17 00:00:00 2001 From: longjin Date: Sun, 16 Oct 2022 11:08:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86makefile=E4=B8=AD=E7=9A=84gcc=E5=AD=97?= =?UTF-8?q?=E6=A0=B7=E7=94=A8$(CC)=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E4=BB=A3=E6=9B=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 1 + kernel/Makefile | 4 ++-- kernel/arch/x86_64/Makefile | 4 ++-- kernel/common/math/Makefile | 6 +++--- kernel/debug/Makefile | 6 +++--- kernel/driver/acpi/Makefile | 2 +- kernel/driver/disk/Makefile | 4 ++-- kernel/driver/hid/Makefile | 2 +- kernel/driver/hid/usbhid/Makefile | 2 +- kernel/driver/interrupt/Makefile | 6 +++--- kernel/driver/keyboard/Makefile | 2 +- kernel/driver/mouse/Makefile | 2 +- kernel/driver/multiboot2/Makefile | 2 +- kernel/driver/pci/Makefile | 4 ++-- kernel/driver/timers/Makefile | 4 ++-- kernel/driver/tty/Makefile | 2 +- kernel/driver/uart/Makefile | 2 +- kernel/driver/usb/Makefile | 4 ++-- kernel/driver/video/Makefile | 2 +- kernel/exception/Makefile | 8 ++++---- kernel/filesystem/Makefile | 2 +- kernel/filesystem/VFS/Makefile | 2 +- kernel/filesystem/devfs/Makefile | 2 +- kernel/filesystem/fat32/Makefile | 2 +- kernel/filesystem/rootfs/Makefile | 2 +- kernel/ipc/Makefile | 2 +- kernel/ktest/Makefile | 10 +++++----- kernel/lib/Makefile | 2 +- kernel/lib/libELF/Makefile | 2 +- kernel/lib/libUI/Makefile | 6 +++--- kernel/lib/sys/Makefile | 2 +- kernel/mm/Makefile | 16 ++++++++-------- kernel/process/Makefile | 4 ++-- kernel/sched/Makefile | 2 +- kernel/smp/Makefile | 4 ++-- kernel/syscall/Makefile | 2 +- kernel/time/Makefile | 4 ++-- user/apps/about/Makefile | 2 +- user/apps/shell/Makefile | 8 ++++---- user/libs/libKeyboard/Makefile | 2 +- user/libs/libc/Makefile | 20 ++++++++++---------- user/libs/libc/math/Makefile | 6 +++--- user/libs/libc/sys/Makefile | 4 ++-- user/libs/libc/sysdeps/x86_64/Makefile | 2 +- user/libs/libsystem/Makefile | 2 +- 45 files changed, 91 insertions(+), 90 deletions(-) diff --git a/Makefile b/Makefile index b6a81230..b354df1c 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ ifeq ($(DEBUG), DEBUG) GLOBAL_CFLAGS += -g endif +export CC=gcc .PHONY: all all: kernel user diff --git a/kernel/Makefile b/kernel/Makefile index a9db8fc3..afc8a33f 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -22,14 +22,14 @@ kernel_subdirs := common driver process debug filesystem time arch exception mm head.o: head.S - gcc -E head.S > _head.s # 预处理 + $(CC) -E head.S > _head.s # 预处理 as $(ASFLAGS) -o head.o _head.s main.o: main.c # -fno-builtin: 不使用C语言内建函数 # The -m64 option sets int to 32bits and long and pointer to 64 bits and generates code for AMD’s x86-64 architecture. - gcc $(CFLAGS) -c main.c -o main.o + $(CC) $(CFLAGS) -c main.c -o main.o all: kernel diff --git a/kernel/arch/x86_64/Makefile b/kernel/arch/x86_64/Makefile index 0234eef0..097231ed 100644 --- a/kernel/arch/x86_64/Makefile +++ b/kernel/arch/x86_64/Makefile @@ -3,8 +3,8 @@ CFLAGS += -I . all: x86_64_ipi.o ia64_msi.o x86_64_ipi.o: x86_64_ipi.c - gcc $(CFLAGS) -c x86_64_ipi.c -o x86_64_ipi.o + $(CC) $(CFLAGS) -c x86_64_ipi.c -o x86_64_ipi.o ia64_msi.o: ia64_msi.c - gcc $(CFLAGS) -c ia64_msi.c -o ia64_msi.o + $(CC) $(CFLAGS) -c ia64_msi.c -o ia64_msi.o diff --git a/kernel/common/math/Makefile b/kernel/common/math/Makefile index 996d4fed..c70df022 100644 --- a/kernel/common/math/Makefile +++ b/kernel/common/math/Makefile @@ -5,10 +5,10 @@ CFLAGS += -I . all: fabs.o round.o pow.o fabs.o: fabs.c - gcc $(CFLAGS) -c fabs.c -o fabs.o + $(CC) $(CFLAGS) -c fabs.c -o fabs.o round.o: round.c - gcc $(CFLAGS) -c round.c -o round.o + $(CC) $(CFLAGS) -c round.c -o round.o pow.o: pow.c - gcc $(CFLAGS) -c pow.c -o pow.o \ No newline at end of file + $(CC) $(CFLAGS) -c pow.c -o pow.o \ No newline at end of file diff --git a/kernel/debug/Makefile b/kernel/debug/Makefile index 281c5633..7329f5c4 100644 --- a/kernel/debug/Makefile +++ b/kernel/debug/Makefile @@ -4,11 +4,11 @@ all: traceback.o CFLAGS += -I . kallsyms.o: kallsyms.c - gcc -o kallsyms kallsyms.c + $(CC) -o kallsyms kallsyms.c rm -rf kallsyms.o traceback.o: traceback/traceback.c - gcc $(CFLAGS) -c traceback/traceback.c -o traceback/traceback.o + $(CC) $(CFLAGS) -c traceback/traceback.c -o traceback/traceback.o # 生成内核栈符号表的汇编文件 @@ -16,7 +16,7 @@ generate_kallsyms: kallsyms.o echo "Generating kallsyms..." nm -n $(kernel_root_path)/kernel | ./kallsyms > kallsyms.S - gcc -c kallsyms.S -o kallsyms.o + $(CC) -c kallsyms.S -o kallsyms.o @echo "Kallsyms generated." diff --git a/kernel/driver/acpi/Makefile b/kernel/driver/acpi/Makefile index 8679a6fb..4fed3167 100644 --- a/kernel/driver/acpi/Makefile +++ b/kernel/driver/acpi/Makefile @@ -5,4 +5,4 @@ CFLAGS += -I . acpi.o: acpi.c - gcc $(CFLAGS) -c acpi.c -o acpi.o + $(CC) $(CFLAGS) -c acpi.c -o acpi.o diff --git a/kernel/driver/disk/Makefile b/kernel/driver/disk/Makefile index 44a63927..960b6131 100644 --- a/kernel/driver/disk/Makefile +++ b/kernel/driver/disk/Makefile @@ -4,7 +4,7 @@ all: ata.o ahci.o CFLAGS += -I . ata.o: ata.c - gcc $(CFLAGS) -c ata.c -o ata.o + $(CC) $(CFLAGS) -c ata.c -o ata.o ahci.o: ahci/ahci.c - gcc $(CFLAGS) -c ahci/ahci.c -o ahci/ahci.o \ No newline at end of file + $(CC) $(CFLAGS) -c ahci/ahci.c -o ahci/ahci.o \ No newline at end of file diff --git a/kernel/driver/hid/Makefile b/kernel/driver/hid/Makefile index 63f6e33f..72f3f42e 100644 --- a/kernel/driver/hid/Makefile +++ b/kernel/driver/hid/Makefile @@ -12,7 +12,7 @@ $(kernel_driver_hid_subdirs): ECHO $(MAKE) -C $@ all CFLAGS="$(CFLAGS)" ASFLAGS="$(ASFLAGS)" PIC="$(PIC)" $(kernel_driver_hid_objs): ECHO - gcc $(CFLAGS) -c $@ -o $@.o + $(CC) $(CFLAGS) -c $@ -o $@.o all: $(kernel_driver_hid_objs) $(kernel_driver_hid_subdirs) @echo $(kernel_driver_hid_objs) diff --git a/kernel/driver/hid/usbhid/Makefile b/kernel/driver/hid/usbhid/Makefile index 39103944..2b50bbac 100644 --- a/kernel/driver/hid/usbhid/Makefile +++ b/kernel/driver/hid/usbhid/Makefile @@ -8,7 +8,7 @@ ECHO: @echo "$@" $(kernel_driver_usbhid_objs): ECHO - gcc $(CFLAGS) -c $@ -o $@.o + $(CC) $(CFLAGS) -c $@ -o $@.o all: $(kernel_driver_hid_objs) $(kernel_driver_hid_subdirs) @echo $(kernel_driver_hid_objs) diff --git a/kernel/driver/interrupt/Makefile b/kernel/driver/interrupt/Makefile index 4d02de52..e886b99a 100644 --- a/kernel/driver/interrupt/Makefile +++ b/kernel/driver/interrupt/Makefile @@ -4,11 +4,11 @@ all: pic.o # 中断处理芯片的驱动程序 ifeq ($(PIC), _INTR_8259A_) pic.o: 8259A/8259A.c - gcc $(CFLAGS) -c 8259A/8259A.c -o pic.o + $(CC) $(CFLAGS) -c 8259A/8259A.c -o pic.o else pic.o: apic/apic.c apic_timer.o - gcc $(CFLAGS) -c apic/apic.c -o pic.o + $(CC) $(CFLAGS) -c apic/apic.c -o pic.o apic_timer.o: apic/apic_timer.c - gcc $(CFLAGS) -c apic/apic_timer.c -o apic/apic_timer.o + $(CC) $(CFLAGS) -c apic/apic_timer.c -o apic/apic_timer.o endif \ No newline at end of file diff --git a/kernel/driver/keyboard/Makefile b/kernel/driver/keyboard/Makefile index 245b69e9..517494b4 100644 --- a/kernel/driver/keyboard/Makefile +++ b/kernel/driver/keyboard/Makefile @@ -5,4 +5,4 @@ CFLAGS += -I . ps2_keyboard.o: ps2_keyboard.c - gcc $(CFLAGS) -c ps2_keyboard.c -o ps2_keyboard.o \ No newline at end of file + $(CC) $(CFLAGS) -c ps2_keyboard.c -o ps2_keyboard.o \ No newline at end of file diff --git a/kernel/driver/mouse/Makefile b/kernel/driver/mouse/Makefile index 93e1a00e..192de29e 100644 --- a/kernel/driver/mouse/Makefile +++ b/kernel/driver/mouse/Makefile @@ -5,4 +5,4 @@ CFLAGS += -I . ps2_mouse.o: ps2_mouse.c - gcc $(CFLAGS) -c ps2_mouse.c -o ps2_mouse.o \ No newline at end of file + $(CC) $(CFLAGS) -c ps2_mouse.c -o ps2_mouse.o \ No newline at end of file diff --git a/kernel/driver/multiboot2/Makefile b/kernel/driver/multiboot2/Makefile index ebe0652d..0e352497 100644 --- a/kernel/driver/multiboot2/Makefile +++ b/kernel/driver/multiboot2/Makefile @@ -4,4 +4,4 @@ all: multiboot2.o CFLAGS += -I . multiboot2.o: multiboot2.c - gcc $(CFLAGS) -c multiboot2.c -o multiboot2.o \ No newline at end of file + $(CC) $(CFLAGS) -c multiboot2.c -o multiboot2.o \ No newline at end of file diff --git a/kernel/driver/pci/Makefile b/kernel/driver/pci/Makefile index b96890c5..55f6c1b9 100644 --- a/kernel/driver/pci/Makefile +++ b/kernel/driver/pci/Makefile @@ -5,7 +5,7 @@ CFLAGS += -I . pci.o: pci.c - gcc $(CFLAGS) -c pci.c -o pci.o + $(CC) $(CFLAGS) -c pci.c -o pci.o msi.o: msi.c - gcc $(CFLAGS) -c msi.c -o msi.o + $(CC) $(CFLAGS) -c msi.c -o msi.o diff --git a/kernel/driver/timers/Makefile b/kernel/driver/timers/Makefile index 42ca1932..21650ea8 100644 --- a/kernel/driver/timers/Makefile +++ b/kernel/driver/timers/Makefile @@ -4,7 +4,7 @@ all: rtc.o HPET.o CFLAGS += -I . rtc.o: rtc/rtc.c - gcc $(CFLAGS) -c rtc/rtc.c -o rtc/rtc.o + $(CC) $(CFLAGS) -c rtc/rtc.c -o rtc/rtc.o HPET.o: HPET/HPET.c - gcc $(CFLAGS) -c HPET/HPET.c -o HPET/HPET.o + $(CC) $(CFLAGS) -c HPET/HPET.c -o HPET/HPET.o diff --git a/kernel/driver/tty/Makefile b/kernel/driver/tty/Makefile index e7a913c7..5af16979 100644 --- a/kernel/driver/tty/Makefile +++ b/kernel/driver/tty/Makefile @@ -5,4 +5,4 @@ CFLAGS += -I . tty.o: tty.c - gcc $(CFLAGS) -c tty.c -o tty.o \ No newline at end of file + $(CC) $(CFLAGS) -c tty.c -o tty.o \ No newline at end of file diff --git a/kernel/driver/uart/Makefile b/kernel/driver/uart/Makefile index 9f8ea0dd..9f068e5f 100644 --- a/kernel/driver/uart/Makefile +++ b/kernel/driver/uart/Makefile @@ -4,4 +4,4 @@ all: uart.o CFLAGS += -I . uart.o: uart.c - gcc $(CFLAGS) -c uart.c -o uart.o + $(CC) $(CFLAGS) -c uart.c -o uart.o diff --git a/kernel/driver/usb/Makefile b/kernel/driver/usb/Makefile index aab3468b..27beeef0 100644 --- a/kernel/driver/usb/Makefile +++ b/kernel/driver/usb/Makefile @@ -3,7 +3,7 @@ CFLAGS += -I . all: usb.o xhci.o usb.o: usb.c - gcc $(CFLAGS) -c usb.c -o usb.o + $(CC) $(CFLAGS) -c usb.c -o usb.o xhci.o: xhci/xhci.c - gcc $(CFLAGS) -c xhci/xhci.c -o xhci/xhci.o \ No newline at end of file + $(CC) $(CFLAGS) -c xhci/xhci.c -o xhci/xhci.o \ No newline at end of file diff --git a/kernel/driver/video/Makefile b/kernel/driver/video/Makefile index 57713fe4..eb0fafb1 100644 --- a/kernel/driver/video/Makefile +++ b/kernel/driver/video/Makefile @@ -5,4 +5,4 @@ CFLAGS += -I . video.o: video.c - gcc $(CFLAGS) -c video.c -o video.o + $(CC) $(CFLAGS) -c video.c -o video.o diff --git a/kernel/exception/Makefile b/kernel/exception/Makefile index e3e0f72b..4539f068 100644 --- a/kernel/exception/Makefile +++ b/kernel/exception/Makefile @@ -5,14 +5,14 @@ CFLAGS += -I . all: entry.o irq.o softirq.o trap.o entry.o: entry.S - gcc -E entry.S > _entry.s + $(CC) -E entry.S > _entry.s as $(ASFLAGS) -o entry.o _entry.s trap.o: trap.c - gcc $(CFLAGS) -c trap.c -o trap.o + $(CC) $(CFLAGS) -c trap.c -o trap.o softirq.o: softirq.c - gcc $(CFLAGS) -c softirq.c -o softirq.o + $(CC) $(CFLAGS) -c softirq.c -o softirq.o irq.o: irq.c - gcc $(CFLAGS) -c irq.c -o irq.o \ No newline at end of file + $(CC) $(CFLAGS) -c irq.c -o irq.o \ No newline at end of file diff --git a/kernel/filesystem/Makefile b/kernel/filesystem/Makefile index 06a538f8..4f50c9f3 100644 --- a/kernel/filesystem/Makefile +++ b/kernel/filesystem/Makefile @@ -10,7 +10,7 @@ ECHO: $(kernel_fs_objs): ECHO - gcc $(CFLAGS) -c $@ -o $@.o + $(CC) $(CFLAGS) -c $@ -o $@.o $(kernel_fs_subdirs): ECHO $(MAKE) -C $@ all CFLAGS="$(CFLAGS)" ASFLAGS="$(ASFLAGS)" PIC="$(PIC)" diff --git a/kernel/filesystem/VFS/Makefile b/kernel/filesystem/VFS/Makefile index 5b016cf9..ff78a304 100644 --- a/kernel/filesystem/VFS/Makefile +++ b/kernel/filesystem/VFS/Makefile @@ -10,7 +10,7 @@ ECHO: $(kernel_fs_vfs_objs): ECHO - gcc $(CFLAGS) -c $@ -o $@.o + $(CC) $(CFLAGS) -c $@ -o $@.o all: $(kernel_fs_vfs_objs) diff --git a/kernel/filesystem/devfs/Makefile b/kernel/filesystem/devfs/Makefile index 75a79c41..ac658731 100644 --- a/kernel/filesystem/devfs/Makefile +++ b/kernel/filesystem/devfs/Makefile @@ -10,7 +10,7 @@ ECHO: $(kernel_fs_devfs_objs): ECHO - gcc $(CFLAGS) -c $@ -o $@.o + $(CC) $(CFLAGS) -c $@ -o $@.o all: $(kernel_fs_devfs_objs) diff --git a/kernel/filesystem/fat32/Makefile b/kernel/filesystem/fat32/Makefile index d4926865..721720d2 100644 --- a/kernel/filesystem/fat32/Makefile +++ b/kernel/filesystem/fat32/Makefile @@ -10,7 +10,7 @@ ECHO: $(kernel_fs_fat32_objs): ECHO - gcc $(CFLAGS) -c $@ -o $@.o + $(CC) $(CFLAGS) -c $@ -o $@.o all: $(kernel_fs_fat32_objs) diff --git a/kernel/filesystem/rootfs/Makefile b/kernel/filesystem/rootfs/Makefile index c8cbe2e2..2228ba3a 100644 --- a/kernel/filesystem/rootfs/Makefile +++ b/kernel/filesystem/rootfs/Makefile @@ -10,7 +10,7 @@ ECHO: $(kernel_fs_rootfs_objs): ECHO - gcc $(CFLAGS) -c $@ -o $@.o + $(CC) $(CFLAGS) -c $@ -o $@.o all: $(kernel_fs_rootfs_objs) diff --git a/kernel/ipc/Makefile b/kernel/ipc/Makefile index 7ee40efa..2be17c47 100644 --- a/kernel/ipc/Makefile +++ b/kernel/ipc/Makefile @@ -4,7 +4,7 @@ all: pipe.o CFLAGS += -I . pipe.o: pipe.c - gcc $(CFLAGS) -c pipe.c -o pipe.o + $(CC) $(CFLAGS) -c pipe.c -o pipe.o clean: echo "Done." \ No newline at end of file diff --git a/kernel/ktest/Makefile b/kernel/ktest/Makefile index 2509f0ce..4c47f8ce 100644 --- a/kernel/ktest/Makefile +++ b/kernel/ktest/Makefile @@ -5,16 +5,16 @@ CFLAGS += -I . all: ktest.o bitree.o kfifo.o mutex.o idr.o ktest.o: ktest.c - gcc $(CFLAGS) -c ktest.c -o ktest.o + $(CC) $(CFLAGS) -c ktest.c -o ktest.o bitree.o: test-bitree.c - gcc $(CFLAGS) -c test-bitree.c -o test-bitree.o + $(CC) $(CFLAGS) -c test-bitree.c -o test-bitree.o kfifo.o: test-kfifo.c - gcc $(CFLAGS) -c test-kfifo.c -o test-kfifo.o + $(CC) $(CFLAGS) -c test-kfifo.c -o test-kfifo.o mutex.o: test-mutex.c - gcc $(CFLAGS) -c test-mutex.c -o test-mutex.o + $(CC) $(CFLAGS) -c test-mutex.c -o test-mutex.o idr.o: test-idr.c - gcc $(CFLAGS) -c test-idr.c -o test-idr.o \ No newline at end of file + $(CC) $(CFLAGS) -c test-idr.c -o test-idr.o \ No newline at end of file diff --git a/kernel/lib/Makefile b/kernel/lib/Makefile index 58ff5c35..8a0b85bc 100644 --- a/kernel/lib/Makefile +++ b/kernel/lib/Makefile @@ -12,7 +12,7 @@ $(kernel_lib_subdirs): ECHO $(MAKE) -C $@ all CFLAGS="$(CFLAGS)" ASFLAGS="$(ASFLAGS)" PIC="$(PIC)" $(kernel_lib_objs): ECHO - gcc $(CFLAGS) -c $@ -o $@.o + $(CC) $(CFLAGS) -c $@ -o $@.o all: $(kernel_lib_objs) $(kernel_lib_subdirs) @echo $(kernel_lib_objs) diff --git a/kernel/lib/libELF/Makefile b/kernel/lib/libELF/Makefile index 6e228b8a..15952aff 100644 --- a/kernel/lib/libELF/Makefile +++ b/kernel/lib/libELF/Makefile @@ -5,4 +5,4 @@ CFLAGS += -I . elf.o: elf.c - gcc $(CFLAGS) -c elf.c -o elf.o + $(CC) $(CFLAGS) -c elf.c -o elf.o diff --git a/kernel/lib/libUI/Makefile b/kernel/lib/libUI/Makefile index 1ad8edec..209e0562 100644 --- a/kernel/lib/libUI/Makefile +++ b/kernel/lib/libUI/Makefile @@ -4,10 +4,10 @@ all: screen_manager.o textui.o textui-render.o CFLAGS += -I . screen_manager.o: screen_manager.c - gcc $(CFLAGS) -c screen_manager.c -o screen_manager.o + $(CC) $(CFLAGS) -c screen_manager.c -o screen_manager.o textui.o: textui.c - gcc $(CFLAGS) -c textui.c -o textui.o + $(CC) $(CFLAGS) -c textui.c -o textui.o textui-render.o: textui-render.c - gcc $(CFLAGS) -c textui-render.c -o textui-render.o + $(CC) $(CFLAGS) -c textui-render.c -o textui-render.o diff --git a/kernel/lib/sys/Makefile b/kernel/lib/sys/Makefile index 2891405e..bf90c8ea 100644 --- a/kernel/lib/sys/Makefile +++ b/kernel/lib/sys/Makefile @@ -7,7 +7,7 @@ ECHO: @echo "$@" $(kernel_lib_sys_objs): ECHO - gcc $(CFLAGS) -c $@ -o $@.o + $(CC) $(CFLAGS) -c $@ -o $@.o all: $(kernel_lib_sys_objs) @echo $(kernel_lib_sys_objs) diff --git a/kernel/mm/Makefile b/kernel/mm/Makefile index 2761d842..ea4a9d33 100644 --- a/kernel/mm/Makefile +++ b/kernel/mm/Makefile @@ -5,25 +5,25 @@ CFLAGS += -I . all:mm.o slab.o mm-stat.o vma.o mmap.o utils.o mmio.o mmio-buddy.o mm.o: mm.c - gcc $(CFLAGS) -c mm.c -o mm.o + $(CC) $(CFLAGS) -c mm.c -o mm.o slab.o: slab.c - gcc $(CFLAGS) -c slab.c -o slab.o + $(CC) $(CFLAGS) -c slab.c -o slab.o mm-stat.o: mm-stat.c - gcc $(CFLAGS) -c mm-stat.c -o mm-stat.o + $(CC) $(CFLAGS) -c mm-stat.c -o mm-stat.o vma.o: vma.c - gcc $(CFLAGS) -c vma.c -o vma.o + $(CC) $(CFLAGS) -c vma.c -o vma.o mmap.o: mmap.c - gcc $(CFLAGS) -c mmap.c -o mmap.o + $(CC) $(CFLAGS) -c mmap.c -o mmap.o utils.o: utils.c - gcc $(CFLAGS) -c utils.c -o utils.o + $(CC) $(CFLAGS) -c utils.c -o utils.o mmio.o: mmio.c - gcc $(CFLAGS) -c mmio.c -o mmio.o + $(CC) $(CFLAGS) -c mmio.c -o mmio.o mmio-buddy.o: mmio-buddy.c - gcc $(CFLAGS) -c mmio-buddy.c -o mmio-buddy.o \ No newline at end of file + $(CC) $(CFLAGS) -c mmio-buddy.c -o mmio-buddy.o \ No newline at end of file diff --git a/kernel/process/Makefile b/kernel/process/Makefile index 87172b3c..cbfeefb3 100644 --- a/kernel/process/Makefile +++ b/kernel/process/Makefile @@ -9,10 +9,10 @@ ECHO: $(kernel_process_objs): ECHO - gcc $(CFLAGS) -c $@ -o $@.o + $(CC) $(CFLAGS) -c $@ -o $@.o procs.o: proc.S - gcc -E proc.S > _proc.s + $(CC) -E proc.S > _proc.s as $(ASFLAGS) -o procs.o _proc.s all: procs.o $(kernel_process_objs) diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile index 54099cbc..c22a6e24 100644 --- a/kernel/sched/Makefile +++ b/kernel/sched/Makefile @@ -5,4 +5,4 @@ CFLAGS += -I . all: sched.o sched.o: sched.c - gcc $(CFLAGS) -c sched.c -o sched.o + $(CC) $(CFLAGS) -c sched.c -o sched.o diff --git a/kernel/smp/Makefile b/kernel/smp/Makefile index 7f7ab081..ab9c7b33 100644 --- a/kernel/smp/Makefile +++ b/kernel/smp/Makefile @@ -6,8 +6,8 @@ all: apu_boot.o smp.o apu_boot.o: apu_boot.S - gcc -E apu_boot.S > _apu_boot.s # 预处理 + $(CC) -E apu_boot.S > _apu_boot.s # 预处理 as $(ASFLAGS) -o apu_boot.o _apu_boot.s smp.o: smp.c - gcc $(CFLAGS) -c smp.c -o smp.o \ No newline at end of file + $(CC) $(CFLAGS) -c smp.c -o smp.o \ No newline at end of file diff --git a/kernel/syscall/Makefile b/kernel/syscall/Makefile index e82c325d..477a787a 100644 --- a/kernel/syscall/Makefile +++ b/kernel/syscall/Makefile @@ -5,4 +5,4 @@ CFLAGS += -I . all: syscall.o syscall.o: syscall.c - gcc $(CFLAGS) -c syscall.c -o syscall.o + $(CC) $(CFLAGS) -c syscall.c -o syscall.o diff --git a/kernel/time/Makefile b/kernel/time/Makefile index ffb594a8..9948a9a6 100644 --- a/kernel/time/Makefile +++ b/kernel/time/Makefile @@ -4,10 +4,10 @@ all: timer.o sleep.o CFLAGS += -I . timer.o: timer.c - gcc $(CFLAGS) -c timer.c -o timer.o + $(CC) $(CFLAGS) -c timer.c -o timer.o sleep.o: sleep.c - gcc $(CFLAGS) -c sleep.c -o sleep.o + $(CC) $(CFLAGS) -c sleep.c -o sleep.o clean: echo "Done." \ No newline at end of file diff --git a/user/apps/about/Makefile b/user/apps/about/Makefile index 8a3326cd..b34ed553 100644 --- a/user/apps/about/Makefile +++ b/user/apps/about/Makefile @@ -4,4 +4,4 @@ all: about.o objcopy -I elf64-x86-64 -R ".eh_frame" -R ".comment" -O elf64-x86-64 $(tmp_output_dir)/about $(output_dir)/about.elf about.o: about.c - gcc $(CFLAGS) -c about.c -o about.o + $(CC) $(CFLAGS) -c about.c -o about.o diff --git a/user/apps/shell/Makefile b/user/apps/shell/Makefile index 66125fd8..3a33eb30 100644 --- a/user/apps/shell/Makefile +++ b/user/apps/shell/Makefile @@ -4,13 +4,13 @@ all: shell.o cmd.o cmd_help.o cmd_test.o objcopy -I elf64-x86-64 -R ".eh_frame" -R ".comment" -O elf64-x86-64 $(tmp_output_dir)/shell $(output_dir)/shell.elf shell.o: shell.c - gcc $(CFLAGS) -c shell.c -o shell.o + $(CC) $(CFLAGS) -c shell.c -o shell.o cmd.o: cmd.c - gcc $(CFLAGS) -c cmd.c -o cmd.o + $(CC) $(CFLAGS) -c cmd.c -o cmd.o cmd_test.o: cmd_test.c - gcc $(CFLAGS) -c cmd_test.c -o cmd_test.o + $(CC) $(CFLAGS) -c cmd_test.c -o cmd_test.o cmd_help.o: cmd_help.c - gcc $(CFLAGS) -c cmd_help.c -o cmd_help.o + $(CC) $(CFLAGS) -c cmd_help.c -o cmd_help.o diff --git a/user/libs/libKeyboard/Makefile b/user/libs/libKeyboard/Makefile index 59d35c64..bb34dc7b 100644 --- a/user/libs/libKeyboard/Makefile +++ b/user/libs/libKeyboard/Makefile @@ -4,4 +4,4 @@ CFLAGS += -I . keyboard.o: keyboard.c - gcc $(CFLAGS) -c keyboard.c -o keyboard.o \ No newline at end of file + $(CC) $(CFLAGS) -c keyboard.c -o keyboard.o \ No newline at end of file diff --git a/user/libs/libc/Makefile b/user/libs/libc/Makefile index 00b7e797..60d6e1d6 100644 --- a/user/libs/libc/Makefile +++ b/user/libs/libc/Makefile @@ -18,31 +18,31 @@ libc: unistd.o fcntl.o malloc.o errno.o printf.o stdlib.o ctype.o string.o diren done unistd.o: unistd.c - gcc $(CFLAGS) -c unistd.c -o unistd.o + $(CC) $(CFLAGS) -c unistd.c -o unistd.o fcntl.o: fcntl.c - gcc $(CFLAGS) -c fcntl.c -o fcntl.o + $(CC) $(CFLAGS) -c fcntl.c -o fcntl.o malloc.o: malloc.c - gcc $(CFLAGS) -c malloc.c -o malloc.o + $(CC) $(CFLAGS) -c malloc.c -o malloc.o errno.o: errno.c - gcc $(CFLAGS) -c errno.c -o errno.o + $(CC) $(CFLAGS) -c errno.c -o errno.o printf.o: printf.c - gcc $(CFLAGS) -c printf.c -o printf.o + $(CC) $(CFLAGS) -c printf.c -o printf.o stdlib.o: stdlib.c - gcc $(CFLAGS) -c stdlib.c -o stdlib.o + $(CC) $(CFLAGS) -c stdlib.c -o stdlib.o ctype.o: ctype.c - gcc $(CFLAGS) -c ctype.c -o ctype.o + $(CC) $(CFLAGS) -c ctype.c -o ctype.o string.o: string.c - gcc $(CFLAGS) -c string.c -o string.o + $(CC) $(CFLAGS) -c string.c -o string.o dirent.o: dirent.c - gcc $(CFLAGS) -c dirent.c -o dirent.o + $(CC) $(CFLAGS) -c dirent.c -o dirent.o time.o: time.c - gcc $(CFLAGS) -c time.c -o time.o \ No newline at end of file + $(CC) $(CFLAGS) -c time.c -o time.o \ No newline at end of file diff --git a/user/libs/libc/math/Makefile b/user/libs/libc/math/Makefile index 996d4fed..c70df022 100644 --- a/user/libs/libc/math/Makefile +++ b/user/libs/libc/math/Makefile @@ -5,10 +5,10 @@ CFLAGS += -I . all: fabs.o round.o pow.o fabs.o: fabs.c - gcc $(CFLAGS) -c fabs.c -o fabs.o + $(CC) $(CFLAGS) -c fabs.c -o fabs.o round.o: round.c - gcc $(CFLAGS) -c round.c -o round.o + $(CC) $(CFLAGS) -c round.c -o round.o pow.o: pow.c - gcc $(CFLAGS) -c pow.c -o pow.o \ No newline at end of file + $(CC) $(CFLAGS) -c pow.c -o pow.o \ No newline at end of file diff --git a/user/libs/libc/sys/Makefile b/user/libs/libc/sys/Makefile index 39b79634..97b44b8b 100644 --- a/user/libs/libc/sys/Makefile +++ b/user/libs/libc/sys/Makefile @@ -5,7 +5,7 @@ CFLAGS += -I . wait.o: wait.c - gcc $(CFLAGS) -c wait.c -o wait.o + $(CC) $(CFLAGS) -c wait.c -o wait.o stat.o: stat.c - gcc $(CFLAGS) -c stat.c -o stat.o \ No newline at end of file + $(CC) $(CFLAGS) -c stat.c -o stat.o \ No newline at end of file diff --git a/user/libs/libc/sysdeps/x86_64/Makefile b/user/libs/libc/sysdeps/x86_64/Makefile index a66a3ef6..5519b2f8 100644 --- a/user/libs/libc/sysdeps/x86_64/Makefile +++ b/user/libs/libc/sysdeps/x86_64/Makefile @@ -4,7 +4,7 @@ all: start.o ifeq ($(ARCH), __x86_64__) start.o: - gcc $(CFLAGS) -c elf/start.c -o elf/start.o + $(CC) $(CFLAGS) -c elf/start.c -o elf/start.o endif clean: diff --git a/user/libs/libsystem/Makefile b/user/libs/libsystem/Makefile index f360387d..f708200d 100644 --- a/user/libs/libsystem/Makefile +++ b/user/libs/libsystem/Makefile @@ -5,4 +5,4 @@ all: libsystem libsystem: syscall.o syscall.o: syscall.c - gcc $(CFLAGS) -c syscall.c -o syscall.o + $(CC) $(CFLAGS) -c syscall.c -o syscall.o