Unverified Commit a0490e7f authored by Sanaki's avatar Sanaki Committed by GitHub
Browse files

Fix explicit CC/CXX settings breaking Windows build

Fixed CC/CC_AS/CXX to only set if unset in the Windows block. Without this, Windows builds come out as Linux binaries when cross-compiled. Applied the same fix to the ARM block, just in case.
parent 9b21e1b3
......@@ -331,9 +331,9 @@ else ifneq (,$(findstring armv,$(platform)))
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
SHARED := -shared -Wl,-version-script=build/link.T
CC = gcc
CC_AS = gcc
CXX = g++
CC ?= gcc
CC_AS ?= gcc
CXX ?= g++
ifneq (,$(findstring cortexa8,$(platform)))
PLATFORM_DEFINES += -marm -mcpu=cortex-a8
else ifneq (,$(findstring cortexa9,$(platform)))
......@@ -386,9 +386,9 @@ else ifeq ($(platform), vita)
# Windows
else
TARGET := $(TARGET_NAME)_libretro.dll
CC = gcc
CC_AS = gcc
CXX = g++
CC ?= gcc
CC_AS ?= gcc
CXX ?= g++
SHARED := -shared -static-libgcc -static-libstdc++ -Wl,-no-undefined -Wl,-version-script=build/link.T
endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment