From efc93d04221d01ac2674f406b084c63f772157dd Mon Sep 17 00:00:00 2001 From: Lior Halphon Date: Sat, 9 Mar 2024 13:37:50 +0200 Subject: [PATCH] Avoid realpath, no available on macOS 12.x --- Makefile | 2 +- libretro/Makefile | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 9688dc052..98d77d975 100644 --- a/Makefile +++ b/Makefile @@ -636,7 +636,7 @@ $(BIN)/BootROMs/%.bin: BootROMs/%.asm $(OBJ)/BootROMs/SameBoyLogo.pb12 # Libretro Core (uses its own build system) libretro: - CFLAGS="$(WARNINGS)" $(MAKE) -C libretro BOOTROMS_DIR=$(BOOTROMS_DIR) BIN=$(BIN) + CFLAGS="$(WARNINGS)" $(MAKE) -C libretro BOOTROMS_DIR=$(abspath $(BOOTROMS_DIR)) BIN=$(abspath $(BIN)) # install for Linux/FreeDesktop/etc. # Does not install mimetype icons because FreeDesktop is cursed abomination with no right to exist. diff --git a/libretro/Makefile b/libretro/Makefile index d3e6cee5f..7459908df 100644 --- a/libretro/Makefile +++ b/libretro/Makefile @@ -328,11 +328,10 @@ endif ifeq ($(STATIC_LINKING), 1) # For some reason libretro's buildbot expects the output to be at ./libretro/ for static targets -BIN ?= $(realpath -m $(CORE_DIR)/libretro) +BIN ?= $(abspath $(CORE_DIR)/libretro) else -BIN ?= $(realpath -m $(CORE_DIR)) +BIN ?= $(abspath $(CORE_DIR)) endif -override BIN := $(shell cd .. && realpath -m $(BIN)) TARGET := $(BIN)/$(TARGET) @@ -373,8 +372,6 @@ CFLAGS += -D__LIBRETRO__ $(fpic) $(INCFLAGS) -std=gnu11 -D_GNU_SOURCE -D_USE_M all: $(TARGET) -override BOOTROMS_DIR := $(shell cd .. && realpath -m $(BOOTROMS_DIR)) - $(CORE_DIR)/libretro/%_boot.c: $(BOOTROMS_DIR)/%_boot.bin echo "/* AUTO-GENERATED */" > $@ echo "const unsigned char $(notdir $(@:%.c=%))[] = {" >> $@