diff --git a/GNUmakefile.in b/GNUmakefile.in index 00ddeb8d..3e69e4ad 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -63,8 +63,6 @@ LIMINE_CC ?= @LIMINE_CC@ export LIMINE_CC LIMINE_LD ?= @LIMINE_LD@ export LIMINE_LD -LIMINE_AR ?= @LIMINE_AR@ -export LIMINE_AR LIMINE_OBJCOPY ?= @LIMINE_OBJCOPY@ export LIMINE_OBJCOPY LIMINE_OBJDUMP ?= @LIMINE_OBJDUMP@ diff --git a/common/GNUmakefile b/common/GNUmakefile index 0c91a236..1672895e 100644 --- a/common/GNUmakefile +++ b/common/GNUmakefile @@ -280,7 +280,7 @@ $(call MKESCAPE,$(BUILDDIR))/BOOTX64.EFI: $(call MKESCAPE,$(BUILDDIR))/limine.el $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-x86_64.o: limine-efi true -$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a: limine-efi +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_x86_64.o: limine-efi true .PHONY: limine-efi @@ -290,14 +290,13 @@ limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi CC="$(LIMINE_CC) -m64 -march=x86-64 -mtune=generic" \ CFLAGS='-nostdinc' \ INCDIR='-I$(call SHESCAPE,$(SRCDIR))/../freestanding_headers' \ - AR="$(LIMINE_AR)" \ ARCH=x86_64 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_x86_64.ld.in mkdir -p '$(call SHESCAPE,$(BUILDDIR))' $(LIMINE_CC) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_x86_64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' -$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-x86_64.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a $(OBJ) ../libgcc-binaries/libgcc-x86_64-no-red-zone.a $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o +$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-x86_64.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_x86_64.o $(OBJ) ../libgcc-binaries/libgcc-x86_64-no-red-zone.a $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(MAKE) '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' $(LIMINE_LD) \ -T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \ @@ -307,7 +306,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_x86_64.ld.in mkdir -p '$(call SHESCAPE,$(BUILDDIR))' $(LIMINE_CC) -x c -E -P -undef linker_uefi_x86_64.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld' -$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-x86_64.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a $(OBJ) ../libgcc-binaries/libgcc-x86_64-no-red-zone.a $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(call MKESCAPE,$(BUILDDIR))/full.map.o +$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-x86_64.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_x86_64.o $(OBJ) ../libgcc-binaries/libgcc-x86_64-no-red-zone.a $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(call MKESCAPE,$(BUILDDIR))/full.map.o $(MAKE) '$(call SHESCAPE,$(BUILDDIR))/linker.ld' $(LIMINE_LD) \ -T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \ @@ -329,7 +328,7 @@ $(call MKESCAPE,$(BUILDDIR))/BOOTIA32.EFI: $(call MKESCAPE,$(BUILDDIR))/limine.e $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-ia32.o: limine-efi true -$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a: limine-efi +$(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_ia32.o: limine-efi true .PHONY: limine-efi @@ -339,14 +338,13 @@ limine-efi: $(call MKESCAPE,$(BUILDDIR))/limine-efi CC="$(LIMINE_CC) -m32 -march=i686 -mtune=generic" \ CFLAGS='-nostdinc' \ INCDIR='-I$(call SHESCAPE,$(SRCDIR))/../freestanding_headers' \ - AR="$(LIMINE_AR)" \ ARCH=ia32 $(call MKESCAPE,$(BUILDDIR))/linker_nomap.ld: linker_uefi_ia32.ld.in mkdir -p '$(call SHESCAPE,$(BUILDDIR))' $(LIMINE_CC) -x c -E -P -undef -DLINKER_NOMAP linker_uefi_ia32.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' -$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-ia32.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a $(OBJ) ../libgcc-binaries/libgcc-i686.a $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o +$(call MKESCAPE,$(BUILDDIR))/limine_nomap.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-ia32.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_ia32.o $(OBJ) ../libgcc-binaries/libgcc-i686.a $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(MAKE) '$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' $(LIMINE_LD) \ -T'$(call SHESCAPE,$(BUILDDIR))/linker_nomap.ld' \ @@ -356,7 +354,7 @@ $(call MKESCAPE,$(BUILDDIR))/linker.ld: linker_uefi_ia32.ld.in mkdir -p '$(call SHESCAPE,$(BUILDDIR))' $(LIMINE_CC) -x c -E -P -undef linker_uefi_ia32.ld.in -o '$(call SHESCAPE,$(BUILDDIR))/linker.ld' -$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-ia32.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/libgnuefi.a $(OBJ) ../libgcc-binaries/libgcc-i686.a $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(call MKESCAPE,$(BUILDDIR))/full.map.o +$(call MKESCAPE,$(BUILDDIR))/limine.elf: $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/crt0-efi-ia32.o $(call MKESCAPE,$(BUILDDIR))/limine-efi/gnuefi/reloc_ia32.o $(OBJ) ../libgcc-binaries/libgcc-i686.a $(call MKESCAPE,$(BUILDDIR))/tinf/tinfgzip.o $(call MKESCAPE,$(BUILDDIR))/tinf/tinflate.o $(call MKESCAPE,$(BUILDDIR))/font.o $(call MKESCAPE,$(BUILDDIR))/sys/smp_trampoline.o $(call MKESCAPE,$(BUILDDIR))/full.map.o $(MAKE) '$(call SHESCAPE,$(BUILDDIR))/linker.ld' $(LIMINE_LD) \ -T'$(call SHESCAPE,$(BUILDDIR))/linker.ld' \ diff --git a/configure.ac b/configure.ac index 9f8dbe9d..5ee8d64d 100644 --- a/configure.ac +++ b/configure.ac @@ -157,7 +157,6 @@ AC_SUBST(BUILD_CD_EFI, [$BUILD_CD_EFI]) AC_ARG_VAR(TOOLCHAIN, [alternative toolchain prefix (or 'llvm')]) AC_ARG_VAR(LIMINE_CC, [C compiler command for Limine]) AC_ARG_VAR(LIMINE_LD, [linker command for Limine]) -AC_ARG_VAR(LIMINE_AR, [archiver command for Limine]) AC_ARG_VAR(LIMINE_OBJCOPY, [objcopy command for Limine]) AC_ARG_VAR(LIMINE_OBJDUMP, [objdump command for Limine]) AC_ARG_VAR(LIMINE_READELF, [readelf command for Limine]) diff --git a/toolchain-detect/toolchain.mk.in b/toolchain-detect/toolchain.mk.in index 19957cb4..7aed92bd 100644 --- a/toolchain-detect/toolchain.mk.in +++ b/toolchain-detect/toolchain.mk.in @@ -2,8 +2,6 @@ override LIMINE_CC := @LIMINE_CC@ export LIMINE_CC override LIMINE_LD := @LIMINE_LD@ export LIMINE_LD -override LIMINE_AR := @LIMINE_AR@ -export LIMINE_AR override LIMINE_OBJCOPY := @LIMINE_OBJCOPY@ export LIMINE_OBJCOPY override LIMINE_OBJDUMP := @LIMINE_OBJDUMP@