From 0f2c5cac983ddd41e4dfef5dca1f885c3889b300 Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@rightscale.com>
Date: Fri, 23 Sep 2016 00:16:24 -0700
Subject: [PATCH] fix travis #8

---
 Makefile                    | 12 +++++-------
 espfs/mkespfsimage/Makefile |  5 +++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 92d0ac7..2ba0426 100644
--- a/Makefile
+++ b/Makefile
@@ -234,11 +234,11 @@ LIBS = c gcc hal phy pp net80211 wpa main lwip crypto
 
 # compiler flags using during compilation of source files
 CFLAGS	+= -Os -ggdb -std=c99 -Werror -Wpointer-arith -Wundef -Wall -Wl,-EL -fno-inline-functions \
-		-nostdlib -mlongcalls -mtext-section-literals -ffunction-sections -fdata-sections \
-		-D__ets__ -DICACHE_FLASH -Wno-address -DFIRMWARE_SIZE=$(ESP_FLASH_MAX) \
-		-DMCU_RESET_PIN=$(MCU_RESET_PIN) -DMCU_ISP_PIN=$(MCU_ISP_PIN) \
-		-DLED_CONN_PIN=$(LED_CONN_PIN) -DLED_SERIAL_PIN=$(LED_SERIAL_PIN) \
-		-DVERSION="$(VERSION)"
+	-nostdlib -mlongcalls -mtext-section-literals -ffunction-sections -fdata-sections \
+	-D__ets__ -DICACHE_FLASH -Wno-address -DFIRMWARE_SIZE=$(ESP_FLASH_MAX) \
+	-DMCU_RESET_PIN=$(MCU_RESET_PIN) -DMCU_ISP_PIN=$(MCU_ISP_PIN) \
+	-DLED_CONN_PIN=$(LED_CONN_PIN) -DLED_SERIAL_PIN=$(LED_SERIAL_PIN) \
+	-DVERSION="$(VERSION)"
 
 # linker flags used to generate the main object file
 LDFLAGS		= -nostdlib -Wl,--no-check-sections -u call_user_start -Wl,-static -Wl,--gc-sections
@@ -254,7 +254,6 @@ SDK_LDDIR	= ld
 SDK_INCDIR	= include include/json
 SDK_TOOLSDIR	= tools
 
-$(warning Hello 1)
 # select which tools to use as compiler, librarian and linker
 CC		:= $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-gcc
 AR		:= $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-ar
@@ -339,7 +338,6 @@ $1/%.o: %.c
 	$(vecho) "CC $$<"
 	$(Q)$(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS)  -c $$< -o $$@
 endef
-$(warning Hello 2)
 
 .PHONY: all checkdirs clean webpages.espfs wiflash
 
diff --git a/espfs/mkespfsimage/Makefile b/espfs/mkespfsimage/Makefile
index 2980331..9b910ff 100644
--- a/espfs/mkespfsimage/Makefile
+++ b/espfs/mkespfsimage/Makefile
@@ -34,9 +34,10 @@ clean:
 
 else
 
+CC=gcc
 CFLAGS=-I.. -std=gnu99
 ifeq ("$(GZIP_COMPRESSION)","yes")
-CFLAGS		+= -DESPFS_GZIP
+CFLAGS+= -DESPFS_GZIP
 endif
 
 OBJS=main.o
@@ -52,4 +53,4 @@ endif
 clean:
 	rm -f $(TARGET) $(OBJS)
 
-endif
\ No newline at end of file
+endif