From 0a98f4390272508487fd6a34c3ee917353dec5ab Mon Sep 17 00:00:00 2001 From: sheinz Date: Fri, 15 Jul 2016 19:01:17 +0300 Subject: [PATCH] SPIFFS: Fixed linux build and travis build mkspiffs utility explicitly use gcc to compile --- extras/spiffs/mkspiffs/Makefile | 4 ++++ extras/spiffs/mkspiffs/mkspiffs.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/extras/spiffs/mkspiffs/Makefile b/extras/spiffs/mkspiffs/Makefile index 7517456..a9a9722 100644 --- a/extras/spiffs/mkspiffs/Makefile +++ b/extras/spiffs/mkspiffs/Makefile @@ -11,6 +11,10 @@ $(error $(ERROR_MSG)) endif endif +# explicitly use gcc as in xtensa build environment it might be set to +# cross compiler +CC = gcc + SOURCES := spiffs_hydrogen.c SOURCES += spiffs_cache.c SOURCES += spiffs_gc.c diff --git a/extras/spiffs/mkspiffs/mkspiffs.c b/extras/spiffs/mkspiffs/mkspiffs.c index 9f231a8..65b90e0 100644 --- a/extras/spiffs/mkspiffs/mkspiffs.c +++ b/extras/spiffs/mkspiffs/mkspiffs.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include