From fb9ca6921aa209da979137041f41f3f1a48d9f18 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Sun, 10 Jul 2022 22:16:58 -0700 Subject: [PATCH] Fix top-level build rules for FreeBSD * use gsed, not sed, like on macosx * GNU make is not "make" on BSD systems, it's "gmake", so use $(MAKE) instead so it picks up the executed make program. --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a050a01..4c883ec 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ include disable_implicite_rules.mk # ================================================= # variables # ================================================= -SHELL = /bin/bash +SHELL ?= /bin/bash PREFIX ?= /opt/amiga export PATH := $(PREFIX)/bin:$(PATH) @@ -25,6 +25,8 @@ GCC_VERSION ?= $(shell cat 2>/dev/null $(PROJECTS)/gcc/gcc/BASE-VER) ifeq ($(UNAME_S), Darwin) SED := gsed +else ifeq ($(UNAME_S), FreeBSD) + SED := gsed else SED := sed endif @@ -68,7 +70,7 @@ THREADS ?= no # ================================================= # determine exe extension for cygwin -$(eval MYMAKE = $(shell which make 2>/dev/null) ) +$(eval MYMAKE = $(shell which $(MAKE) 2>/dev/null) ) $(eval MYMAKEEXE = $(shell which "$(MYMAKE:%=%.exe)" 2>/dev/null) ) EXEEXT:=$(MYMAKEEXE:%=.exe) @@ -303,7 +305,7 @@ update-libpthread: $(PROJECTS)/aros-stuff/pthreads/Makefile @cd $(PROJECTS)/aros-stuff && git pull update-ndk: $(DOWNLOAD)/$(NDK_ARC_NAME).lha - make $(PROJECTS)/$(NDK_FOLDER_NAME).info + $(MAKE) $(PROJECTS)/$(NDK_FOLDER_NAME).info update-newlib: $(PROJECTS)/newlib-cygwin/newlib/configure @cd $(PROJECTS)/newlib-cygwin && git pull