diff --git a/packages/emulation/libretro-beetle-pcfx/package.mk b/packages/emulation/libretro-beetle-pcfx/package.mk index c12af2bc77..e1833ecef2 100644 --- a/packages/emulation/libretro-beetle-pcfx/package.mk +++ b/packages/emulation/libretro-beetle-pcfx/package.mk @@ -39,22 +39,22 @@ PKG_LIBVAR="BEETLE-PCFX_LIB" make_target() { case $PROJECT in RPi) - make platform=armv6-hardfloat + make CC=$CC CXX=$CXX platform=armv6-hardfloat ;; RPi2) - make platform=armv7-neon-hardfloat + make CC=$CC CXX=$CXX platform=armv7-neon-hardfloat ;; imx6) - make platform=armv7-cortexa9-neon-hardfloat + make CC=$CC CXX=$CXX platform=armv7-cortexa9-neon-hardfloat ;; WeTek_Play|WeTek_Core) - make platform=armv7-cortexa9-neon-hardfloat + make CC=$CC CXX=$CXX platform=armv7-cortexa9-neon-hardfloat ;; Odroid_C2|WeTek_Hub|WeTek_Play_2) - make platform=aarch64 + make CC=$CC CXX=$CXX platform=aarch64 ;; Generic) - make + make CC=$CC CXX=$CXX ;; esac } diff --git a/packages/emulation/libretro-beetle-pcfx/patches/libretro-beetle-pcfx-0001-fix-cross-compile.patch b/packages/emulation/libretro-beetle-pcfx/patches/libretro-beetle-pcfx-0001-fix-cross-compile.patch deleted file mode 100644 index e7fc1b3f39..0000000000 --- a/packages/emulation/libretro-beetle-pcfx/patches/libretro-beetle-pcfx-0001-fix-cross-compile.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 76f4bf49e19a856f62d0ba2bd1061ab63b45f0e4 -Author: Lukas Rusak -Date: Sun Feb 5 17:46:16 2017 -0800 - - don't hard code cc and cxx - -diff --git a/Makefile b/Makefile -index 142113a..86a9fac 100644 ---- a/Makefile -+++ b/Makefile -@@ -197,7 +197,7 @@ else ifneq (,$(findstring armv,$(platform))) - TARGET := $(TARGET_NAME)_libretro.so - fpic := -fPIC - SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T -- CC = gcc -+ CC ?= gcc - LDFLAGS += $(PTHREAD_FLAGS) - FLAGS += $(PTHREAD_FLAGS) -DHAVE_MKDIR - IS_X86 = 0 -@@ -228,8 +228,8 @@ else ifeq ($(platform), emscripten) - - else - TARGET := $(TARGET_NAME)_libretro.dll -- CC = gcc -- CXX = g++ -+ CC ?= gcc -+ CXX ?= g++ - IS_X86 = 1 - SHARED := -shared -Wl,--no-undefined -Wl,--version-script=link.T - LDFLAGS += -static-libgcc -static-libstdc++ -lwinmm