From 88a6232f6aa571abc6a70bb96fe43444996527ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Andr=C3=A9=20Santoni?= Date: Sun, 17 Nov 2019 20:28:23 +0700 Subject: [PATCH] Avoid conflict with an existing HOST_CC on some recipes --- Makefile | 4 ++-- platform/common/common.mak | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 644664d5..d5a6ea72 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ $(LD) ?= $(CC) TARGET ?= PicoDrive CFLAGS += -I. -HOST_CC ?= gcc -HOST_CXX ?= g++ +CYCLONE_CC ?= gcc +CYCLONE_CXX ?= g++ ifneq ("$(PLATFORM)", "libretro") CFLAGS += -Wall -g diff --git a/platform/common/common.mak b/platform/common/common.mak index d66e8b14..51eaa30f 100644 --- a/platform/common/common.mak +++ b/platform/common/common.mak @@ -181,7 +181,7 @@ $(FR)cpu/cyclone/Cyclone.h: $(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/$(CYCLONE_CONFIG) @echo building Cyclone... - @make CC=$(HOST_CC) CXX=$(HOST_CXX) -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG) + @make CC=$(CYCLONE_CC) CXX=$(CYCLONE_CXX) -C $(R)cpu/cyclone/ CONFIG_FILE=../$(CYCLONE_CONFIG) $(FR)cpu/cyclone/Cyclone.s: $(FR)cpu/cyclone/*.cpp $(FR)cpu/cyclone/*.h