(Hopefully) fix the Jenkins build

This commit is contained in:
Tim Angus 2013-03-22 14:26:29 +00:00
parent 95da547711
commit 6155816672

View file

@ -477,16 +477,6 @@ else # ifeq darwin
ifeq ($(PLATFORM),mingw32) ifeq ($(PLATFORM),mingw32)
# Some MinGW installations define CC to cc, but don't actually provide cc,
# so check that CC points to a real binary and use gcc if it doesn't
ifeq ($(call bin_path, $(CC)),)
CC=gcc
endif
ifndef WINDRES
WINDRES=windres
endif
ifeq ($(CROSS_COMPILING),1) ifeq ($(CROSS_COMPILING),1)
# If CC is already set to something generic, we probably want to use # If CC is already set to something generic, we probably want to use
# something more specific # something more specific
@ -509,6 +499,16 @@ ifeq ($(PLATFORM),mingw32)
WINDRES=$(strip $(foreach MINGW_PREFIX, $(MINGW_PREFIXES), \ WINDRES=$(strip $(foreach MINGW_PREFIX, $(MINGW_PREFIXES), \
$(call bin_path, $(MINGW_PREFIX)-windres))) $(call bin_path, $(MINGW_PREFIX)-windres)))
endif endif
else
# Some MinGW installations define CC to cc, but don't actually provide cc,
# so check that CC points to a real binary and use gcc if it doesn't
ifeq ($(call bin_path, $(CC)),)
CC=gcc
endif
ifndef WINDRES
WINDRES=windres
endif
endif endif
BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
@ -1141,6 +1141,9 @@ targets: makedirs
@echo " COMPILE_PLATFORM: $(COMPILE_PLATFORM)" @echo " COMPILE_PLATFORM: $(COMPILE_PLATFORM)"
@echo " COMPILE_ARCH: $(COMPILE_ARCH)" @echo " COMPILE_ARCH: $(COMPILE_ARCH)"
@echo " CC: $(CC)" @echo " CC: $(CC)"
ifeq ($(PLATFORM),mingw32)
@echo " WINDRES: $(WINDRES)"
endif
@echo "" @echo ""
@echo " CFLAGS:" @echo " CFLAGS:"
-@for i in $(CFLAGS); \ -@for i in $(CFLAGS); \