From 4eae83278dabb3f5099f609a77b0567acd34fdd2 Mon Sep 17 00:00:00 2001
From: Romain Goyet <romain@goyet.com>
Date: Sat, 5 Nov 2016 14:51:55 +0100
Subject: [PATCH] Factorize the HOSTCC/HOSTCXX definition

Change-Id: I449289e999238c7ca54974e071577d06130991a9
---
 Makefile                                        | 1 +
 escher/Makefile                                 | 2 +-
 kandinsky/Makefile                              | 2 +-
 poincare/src/simplify/rules_generation/Makefile | 3 ---
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index c0cacaa20..9a4d9a89f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ ifndef USE_LIBA
 endif
 
 HOSTCC = gcc
+HOSTCXX = g++
 
 # Flags - Header search path
 SFLAGS += -Ilib -I.
diff --git a/escher/Makefile b/escher/Makefile
index 03198cfee..15613cd46 100644
--- a/escher/Makefile
+++ b/escher/Makefile
@@ -48,7 +48,7 @@ INLINER := escher/image/inliner
 
 $(INLINER): escher/image/inliner.c
 	@echo "HOSTCC  $@"
-	@$(HOSTCC) `libpng-config --cflags` `libpng-config --ldflags` $< -o $@
+	@$(HOSTCC) -std=c99 `libpng-config --cflags` `libpng-config --ldflags` $< -o $@
 
 inline_image_headers := $(inline_images:.png=.h)
 inline_image_sources := $(inline_images:.png=.cpp)
diff --git a/kandinsky/Makefile b/kandinsky/Makefile
index b6a3cd863..abb9c238c 100644
--- a/kandinsky/Makefile
+++ b/kandinsky/Makefile
@@ -47,7 +47,7 @@ kandinsky/src/font.c: kandinsky/fonts/rasterizer
 
 kandinsky/fonts/rasterizer: kandinsky/fonts/rasterizer.c
 	@echo "HOSTCC  $@"
-	@$(HOSTCC) $(RASTERIZER_CFLAGS) $< $(RASTERIZER_LDFLAGS) -o $@
+	@$(HOSTCC) -std=c99 $(RASTERIZER_CFLAGS) $< $(RASTERIZER_LDFLAGS) -o $@
 
 products += $(font_files) kandinsky/fonts/rasterizer
 
diff --git a/poincare/src/simplify/rules_generation/Makefile b/poincare/src/simplify/rules_generation/Makefile
index c552b6cd4..9ac631d24 100644
--- a/poincare/src/simplify/rules_generation/Makefile
+++ b/poincare/src/simplify/rules_generation/Makefile
@@ -25,9 +25,6 @@ products += $(rulegen_objs) $(RULEGEN) $(addprefix $(dir)/,\
 
 GENERATOR_CXXFLAGS = -std=c++11 -Wno-deprecated-register
 
-HOSTCC = clang
-HOSTCXX = clang++
-
 $(rulegen_objs): %.o: %.cpp
 	@echo "HOSTCC  $@"
 	@$(HOSTCXX) $(GENERATOR_CXXFLAGS) -c $< -o $@