From 413effbdaed9d5c6818aa2b93afd9ffe85c0cc5d Mon Sep 17 00:00:00 2001
From: Johan Euphrosine <proppy@google.com>
Date: Wed, 10 Apr 2019 17:16:55 +0900
Subject: [PATCH] tflite/tools/make: replace CCFLAGS with CFLAGS

---
 tensorflow/lite/tools/make/Makefile                     | 4 ++--
 tensorflow/lite/tools/make/targets/aarch64_makefile.inc | 2 +-
 tensorflow/lite/tools/make/targets/ios_makefile.inc     | 4 ++--
 tensorflow/lite/tools/make/targets/linux_makefile.inc   | 2 +-
 tensorflow/lite/tools/make/targets/rpi_makefile.inc     | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tensorflow/lite/tools/make/Makefile b/tensorflow/lite/tools/make/Makefile
index f338801848d..83be179f606 100644
--- a/tensorflow/lite/tools/make/Makefile
+++ b/tensorflow/lite/tools/make/Makefile
@@ -57,7 +57,7 @@ LIBS := \
 # these settings are for the target compiler.
 CXXFLAGS := -O3 -DNDEBUG -fPIC
 CXXFLAGS += $(EXTRA_CXXFLAGS)
-CCFLAGS := ${CXXFLAGS}
+CFLAGS := ${CXXFLAGS}
 CXXFLAGS += --std=c++11
 CFLAGS :=
 LDOPTS := -L/usr/local/lib
@@ -206,7 +206,7 @@ $(OBJDIR)%.o: %.cc
 # For normal manually-created TensorFlow C++ source files.
 $(OBJDIR)%.o: %.c
 	@mkdir -p $(dir $@)
-	$(CC) $(CCFLAGS) $(INCLUDES) -c $< -o $@
+	$(CC) $(CFLAGS) $(INCLUDES) -c $< -o $@
 
 # The target that's compiled if there's no command-line arguments.
 all: $(LIB_PATH)  $(MINIMAL_BINARY) $(BENCHMARK_BINARY)
diff --git a/tensorflow/lite/tools/make/targets/aarch64_makefile.inc b/tensorflow/lite/tools/make/targets/aarch64_makefile.inc
index d89440651e6..673545ef038 100644
--- a/tensorflow/lite/tools/make/targets/aarch64_makefile.inc
+++ b/tensorflow/lite/tools/make/targets/aarch64_makefile.inc
@@ -11,7 +11,7 @@ ifeq ($(TARGET),aarch64)
     -ftree-vectorize \
     -fPIC
 
-  CCFLAGS += \
+  CFLAGS += \
     -march=armv8-a \
     -funsafe-math-optimizations \
     -ftree-vectorize \
diff --git a/tensorflow/lite/tools/make/targets/ios_makefile.inc b/tensorflow/lite/tools/make/targets/ios_makefile.inc
index ae9276f9a63..8908bb5131e 100644
--- a/tensorflow/lite/tools/make/targets/ios_makefile.inc
+++ b/tensorflow/lite/tools/make/targets/ios_makefile.inc
@@ -31,8 +31,8 @@ ifeq ($(TARGET), ios)
 		${IPHONEOS_SYSROOT} \
 		-arch $(TARGET_ARCH) \
 		-O3
-	CCFLAGS += -miphoneos-version-min=$(MIN_SDK_VERSION) \
-		-fembed-bitcode \
+	CFLAGS += -miphoneos-version-min=$(MIN_SDK_VERSION) \
+	       	-fembed-bitcode \
 		-mno-thumb \
 		-isysroot \
 		${IPHONEOS_SYSROOT} \
diff --git a/tensorflow/lite/tools/make/targets/linux_makefile.inc b/tensorflow/lite/tools/make/targets/linux_makefile.inc
index 5cc8bd01634..222cef9e5ff 100644
--- a/tensorflow/lite/tools/make/targets/linux_makefile.inc
+++ b/tensorflow/lite/tools/make/targets/linux_makefile.inc
@@ -4,7 +4,7 @@ ifeq ($(TARGET), linux)
     -fPIC \
     -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \
     -pthread
-  CCFLAGS += \
+  CFLAGS += \
     -fPIC \
     -DGEMMLOWP_ALLOW_SLOW_SCALAR_FALLBACK \
     -pthread    
diff --git a/tensorflow/lite/tools/make/targets/rpi_makefile.inc b/tensorflow/lite/tools/make/targets/rpi_makefile.inc
index 1ad0c502372..9dbbd4fa6da 100644
--- a/tensorflow/lite/tools/make/targets/rpi_makefile.inc
+++ b/tensorflow/lite/tools/make/targets/rpi_makefile.inc
@@ -13,7 +13,7 @@ ifeq ($(TARGET),rpi)
       -ftree-vectorize \
       -fPIC
 
-    CCFLAGS += \
+    CFLAGS += \
       -march=armv7-a \
       -mfpu=neon-vfpv4 \
       -funsafe-math-optimizations \
@@ -37,7 +37,7 @@ ifeq ($(TARGET),rpi)
       -ftree-vectorize \
       -fPIC
 
-    CCFLAGS += \
+    CFLAGS += \
       -march=armv6 \
       -mfpu=vfp \
       -funsafe-math-optimizations \