PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 21:45:00 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

use TOOLS var in relevant places

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti 2024-05-14 15:06:35 -03:00
parent a1afe21820
commit 33d566b3be
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -79,8 +79,8 @@ ifeq ($(COMPILER),gcc)
CC := $(MIPS_BINUTILS_PREFIX)gcc CC := $(MIPS_BINUTILS_PREFIX)gcc
else else
ifeq ($(COMPILER),ido) ifeq ($(COMPILER),ido)
CC := tools/ido_recomp/$(DETECTED_OS)/7.1/cc CC := $(TOOLS)/ido_recomp/$(DETECTED_OS)/7.1/cc
CC_OLD := tools/ido_recomp/$(DETECTED_OS)/5.3/cc CC_OLD := $(TOOLS)/ido_recomp/$(DETECTED_OS)/5.3/cc
else else
$(error Unsupported compiler. Please use either ido or gcc as the COMPILER variable.) $(error Unsupported compiler. Please use either ido or gcc as the COMPILER variable.)
endif endif
@ -194,7 +194,7 @@ OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump
ICONV := iconv ICONV := iconv
ASM_PROC := $(PYTHON) $(TOOLS)/asm-processor/build.py ASM_PROC := $(PYTHON) $(TOOLS)/asm-processor/build.py
CAT := cat CAT := cat
TORCH := tools/Torch/cmake-build-release/torch TORCH := $(TOOLS)/Torch/cmake-build-release/torch
# Prefer clang as C preprocessor if installed on the system # Prefer clang as C preprocessor if installed on the system
ifneq (,$(call find-command,clang)) ifneq (,$(call find-command,clang))
@ -389,10 +389,10 @@ endif
all: uncompressed all: uncompressed
toolchain: toolchain:
@$(MAKE) -s -C tools @$(MAKE) -s -C $(TOOLS)
torch: torch:
@$(MAKE) -s -C tools torch @$(MAKE) -s -C $(TOOLS) torch
rm -f torch.hash.yml rm -f torch.hash.yml
init: init:
@ -471,7 +471,7 @@ expected:
context: context:
@echo "Generating ctx.c ..." @echo "Generating ctx.c ..."
@$(PYTHON) ./tools/m2ctx.py $(filter-out $@, $(MAKECMDGOALS)) @$(PYTHON) ./$(TOOLS)/m2ctx.py $(filter-out $@, $(MAKECMDGOALS))
disasm: disasm:
@$(RM) -r asm/$(VERSION)/$(REV) bin/$(VERSION)/$(REV) @$(RM) -r asm/$(VERSION)/$(REV) bin/$(VERSION)/$(REV)
@ -528,7 +528,7 @@ build/src/libultra/libc/ll.o: src/libultra/libc/ll.c
$(call print,Patching:,$<,$@) $(call print,Patching:,$<,$@)
@$(CC_CHECK) $(CC_CHECK_FLAGS) $(IINC) -I $(dir $*) $(CHECK_WARNINGS) $(BUILD_DEFINES) $(COMMON_DEFINES) $(RELEASE_DEFINES) $(GBI_DEFINES) $(C_DEFINES) $(MIPS_BUILTIN_DEFS) -o $@ $< @$(CC_CHECK) $(CC_CHECK_FLAGS) $(IINC) -I $(dir $*) $(CHECK_WARNINGS) $(BUILD_DEFINES) $(COMMON_DEFINES) $(RELEASE_DEFINES) $(GBI_DEFINES) $(C_DEFINES) $(MIPS_BUILTIN_DEFS) -o $@ $<
$(V)$(CC) -c $(CFLAGS) $(BUILD_DEFINES) $(IINC) $(WARNINGS) $(MIPS_VERSION) $(ENDIAN) $(COMMON_DEFINES) $(RELEASE_DEFINES) $(GBI_DEFINES) $(C_DEFINES) $(OPTFLAGS) -o $@ $< $(V)$(CC) -c $(CFLAGS) $(BUILD_DEFINES) $(IINC) $(WARNINGS) $(MIPS_VERSION) $(ENDIAN) $(COMMON_DEFINES) $(RELEASE_DEFINES) $(GBI_DEFINES) $(C_DEFINES) $(OPTFLAGS) -o $@ $<
$(V)$(PYTHON) tools/set_o32abi_bit.py $@ $(V)$(PYTHON) $(TOOLS)/set_o32abi_bit.py $@
$(V)$(OBJDUMP_CMD) $(V)$(OBJDUMP_CMD)
$(V)$(RM_MDEBUG) $(V)$(RM_MDEBUG)