Skip to content

Commit

Permalink
if we are building binutils for m68k, and there is an amigaoshunk or …
Browse files Browse the repository at this point in the history
…68080 patch, apply it also.
  • Loading branch information
Kalamatee committed Apr 23, 2022
1 parent b252245 commit 5f4421a
Showing 1 changed file with 17 additions and 2 deletions.
19 changes: 17 additions & 2 deletions tools/crosstools/gnu/mmakefile.src
Original file line number Diff line number Diff line change
Expand Up @@ -233,19 +233,34 @@ tools-crosstools-mpc :

## Binutils ###

BINUTILS_MAINPATCHSPECS = $(crosstools-binutils--archbase)-aros.diff:$(crosstools-binutils--srcdir):-f,-p1
ifeq ($(AROS_TARGET_CPU),m68k)
AMIGAHUNKPATCH := $(call WILDCARD, binutils-$(BINUTILS_VERSION)-amigaoshunk.diff)
APOLLOPATCH := $(call WILDCARD, binutils-$(BINUTILS_VERSION)-68080.diff)
ifneq ($(AMIGAHUNKPATCH),)
BINUTILS_AMIGAHUNKPATCHSPECS = $(crosstools-binutils--archbase)-amigaoshunk.diff:$(crosstools-binutils--srcdir):-f,-p1
endif
ifneq ($(APOLLOPATCH),)
BINUTILS_APOLLOPATCHSPECS = $(crosstools-binutils--archbase)-68080.diff:$(crosstools-binutils--srcdir):-f,-p1
endif
BINUTILS_EXTRAPATCHSPECS = $(BINUTILS_AMIGAHUNKPATCHSPECS) $(BINUTILS_APOLLOPATCHSPECS)
endif
BINUTILS_PATCHSPECS = $(strip $(BINUTILS_MAINPATCHSPECS) $(BINUTILS_EXTRAPATCHSPECS))

# $(find $(HOSTDIR)/Ports/host/binutils/binutils-$(BINUTILS_VERSION)/ -name *.info -print -exec touch {};)
#MM
tools-crosstools-binutils :
@$(IF) ! $(TEST) -d $(CROSSTOOLSDIR) \
|| ! $(TEST) -f $(binutils-installflag) ; then \
$(RM) $(HOSTGENDIR)/$(CURDIR)/binutils/.files-touched \
&& $(MAKE) -f ./mmakefile crosstools-binutils--fetch \
&& $(MAKE) -f ./mmakefile crosstools-binutils--build_and_install-quick \
&& $(TOUCH) $(binutils-installflag) ; \
&& $(TOUCH) $(binutils-installflag) ; \
fi

%fetch_and_build mmake=crosstools-binutils package=binutils version=$(BINUTILS_VERSION) compiler=host \
package_repo="$(GNU_REPOSITORY)/binutils" \
patch=yes \
patch=yes patches_specs=$(BINUTILS_PATCHSPECS) \
prefix="$(CROSSTOOLSDIR)" usecppflags=no \
extraoptions="$(BINUTILS_EXTRA_OPTS)"

Expand Down

0 comments on commit 5f4421a

Please sign in to comment.