From 2461cd921d45e3d75245568bc59831c1f0a43331 Mon Sep 17 00:00:00 2001 From: EmulatedSeasons <89668582+EmulatedSeasons@users.noreply.github.com> Date: Fri, 3 May 2024 01:02:21 -0400 Subject: changed some makefile variables to export --- makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/makefile b/makefile index 8ec9152..ccd252c 100644 --- a/makefile +++ b/makefile @@ -2,13 +2,13 @@ OS_NAME := emuos ARCH = i386 -SYSROOT = $(PWD)/sysroot +export SYSROOT = $(PWD)/sysroot # Variables for easy access of tools like gcc and nasm -CC = i686-elf-gcc -CXX = i686-elf-g++ -LD = i686-elf-ld -NASM = nasm +export CC = i686-elf-gcc +export CXX = i686-elf-g++ +export LD = i686-elf-ld +export NASM = nasm QEMU = qemu-system-i386 ASMFLAGS = -felf32 #CXXFLAGS := -ffreestanding -O2 -Wall -Wextra -fno-exceptions -fno-rtti @@ -20,11 +20,11 @@ all: libck.a kernel.bin grub libck.a: $(info [INFO] Building libck) - $(MAKE) -C ./libs/libck/ ARCH=$(ARCH) PREFIX=$(PWD) CC=$(CC) CXX=$(CXX) LD=$(LD) NASM=$(NASM) SYSROOT=$(SYSROOT) + $(MAKE) -C ./libs/libck/ ARCH=$(ARCH) PREFIX=$(PWD) kernel.bin: $(info [INFO] Building kernel) - $(MAKE) -C ./kernel/ ARCH=$(ARCH) PREFIX=$(PWD) CC=$(CC) CXX=$(CXX) LD=$(LD) NASM=$(NASM) SYSROOT=$(SYSROOT) + $(MAKE) -C ./kernel/ ARCH=$(ARCH) PREFIX=$(PWD) grub: kernel.bin grub.cfg grub-file --is-x86-multiboot $< @@ -38,13 +38,13 @@ qemu: grub install: install-headers install-libraries install-headers: - $(MAKE) -C ./kernel/ install-headers SYSROOT=$(SYSROOT) - $(MAKE) -C ./libs/libck/ install-headers SYSROOT=$(SYSROOT) + $(MAKE) -C ./kernel/ install-headers + $(MAKE) -C ./libs/libck/ install-headers install-libraries: - $(MAKE) -C ./libs/libck/ install-lib SYSROOT=$(SYSROOT) + $(MAKE) -C ./libs/libck/ install-lib clean: - -@$(MAKE) -C ./kernel/ clean SYSROOT=$(SYSROOT) - -@$(MAKE) -C ./libs/libck/ clean SYSROOT=$(SYSROOT) + -@$(MAKE) -C ./kernel/ clean + -@$(MAKE) -C ./libs/libck/ clean -@$(RM) $(wildcard *.bin *.a) -- cgit v1.2.3-70-g09d2