Mesa (master): android: pass -std=c99 by default

[Chia-I Wu]

Module: Mesa
Branch: master
Commit: d2cd621086fdf620a96d599bac0873ff58ddf137
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2cd621086fdf620a96d599bac0873ff58ddf137

Author: Chia-I Wu <olv at lunarg.com>
Date:   Sat Nov 26 11:20:05 2011 +0800

android: pass -std=c99 by default

Several modules expect a C99 compiler already.  It is also the default for
Makefile build.

---

 Android.common.mk                    |    9 +++++++++
 src/gallium/drivers/i915/Android.mk  |    2 --
 src/gallium/drivers/nvfx/Android.mk  |    1 -
 src/gallium/drivers/r300/Android.mk  |    2 --
 src/gallium/drivers/r600/Android.mk  |    2 --
 src/mesa/Android.mk                  |    2 ++
 src/mesa/drivers/dri/i915/Android.mk |    4 ----
 src/mesa/drivers/dri/i965/Android.mk |    4 ----
 8 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/Android.common.mk b/Android.common.mk
index f28ddc2..e8b9006 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -21,6 +21,15 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+# use c99 compiler by default
+ifeq ($(LOCAL_CC),)
+ifeq ($(LOCAL_IS_HOST_MODULE),true)
+LOCAL_CC := $(HOST_CC) -std=c99
+else
+LOCAL_CC := $(TARGET_CC) -std=c99
+endif
+endif
+
 LOCAL_C_INCLUDES += \
 	$(MESA_TOP)/include
 
diff --git a/src/gallium/drivers/i915/Android.mk b/src/gallium/drivers/i915/Android.mk
index 780ace5..fece305 100644
--- a/src/gallium/drivers/i915/Android.mk
+++ b/src/gallium/drivers/i915/Android.mk
@@ -30,8 +30,6 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_CFLAGS := -std=c99
-
 LOCAL_MODULE := libmesa_pipe_i915
 
 include $(GALLIUM_COMMON_MK)
diff --git a/src/gallium/drivers/nvfx/Android.mk b/src/gallium/drivers/nvfx/Android.mk
index 6dee111..219b044 100644
--- a/src/gallium/drivers/nvfx/Android.mk
+++ b/src/gallium/drivers/nvfx/Android.mk
@@ -29,7 +29,6 @@ include $(LOCAL_PATH)/Makefile.sources
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
-LOCAL_CFLAGS := -std=c99
 LOCAL_C_INCLUDES := $(DRM_TOP)
 
 LOCAL_MODULE := libmesa_pipe_nvfx
diff --git a/src/gallium/drivers/r300/Android.mk b/src/gallium/drivers/r300/Android.mk
index fe3c2bd..ff27ef6 100644
--- a/src/gallium/drivers/r300/Android.mk
+++ b/src/gallium/drivers/r300/Android.mk
@@ -30,8 +30,6 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_CFLAGS := -std=c99
-
 LOCAL_C_INCLUDES := \
 	$(MESA_TOP)/src/mapi \
 	$(MESA_TOP)/src/glsl \
diff --git a/src/gallium/drivers/r600/Android.mk b/src/gallium/drivers/r600/Android.mk
index f060920..e5188bb 100644
--- a/src/gallium/drivers/r600/Android.mk
+++ b/src/gallium/drivers/r600/Android.mk
@@ -30,8 +30,6 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(C_SOURCES)
 
-LOCAL_CFLAGS := -std=c99
-
 LOCAL_C_INCLUDES :=
 
 LOCAL_MODULE := libmesa_pipe_r600
diff --git a/src/mesa/Android.mk b/src/mesa/Android.mk
index f21ba3a..f6c0f4e 100644
--- a/src/mesa/Android.mk
+++ b/src/mesa/Android.mk
@@ -56,6 +56,7 @@ LOCAL_SRC_FILES := x86/gen_matypes.c
 LOCAL_CFLAGS := $(common_CFLAGS)
 LOCAL_C_INCLUDES := $(common_C_INCLUDES)
 LOCAL_MODULE := mesa_gen_matypes
+LOCAL_IS_HOST_MODULE := true
 include $(MESA_COMMON_MK)
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -145,6 +146,7 @@ LOCAL_SRC_FILES := \
 	program/symbol_table.c
 
 LOCAL_MODULE := libmesa_glsl_utils
+LOCAL_IS_HOST_MODULE := true
 
 include $(MESA_COMMON_MK)
 include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/src/mesa/drivers/dri/i915/Android.mk b/src/mesa/drivers/dri/i915/Android.mk
index 21b3450..b615e9b 100644
--- a/src/mesa/drivers/dri/i915/Android.mk
+++ b/src/mesa/drivers/dri/i915/Android.mk
@@ -32,10 +32,6 @@ LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH)
 # Import variables i915_*.
 include $(LOCAL_PATH)/Makefile.sources
 
-# Overriding LOCAL_CC below is an ugly workaround.  We cannot place -std=c99
-# in LOCAL_C_FLAGS because Android appends LOCAL_C_FLAGS to LOCAL_CPP_FLAGS.
-LOCAL_CC := $(TARGET_CC) -std=c99
-
 LOCAL_CFLAGS := \
 	$(MESA_DRI_CFLAGS) \
 	-DI915
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk
index 3f49c8b..ec4a761 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -32,10 +32,6 @@ LOCAL_UNSTRIPPED_PATH := $(MESA_DRI_MODULE_UNSTRIPPED_PATH)
 # Import variables i965_*.
 include $(LOCAL_PATH)/Makefile.sources
 
-# Overriding LOCAL_CC below is an ugly workaround.  We cannot place -std=c99
-# in LOCAL_C_FLAGS because Android appends LOCAL_C_FLAGS to LOCAL_CPP_FLAGS.
-LOCAL_CC := $(TARGET_CC) -std=c99
-
 LOCAL_CFLAGS := \
 	$(MESA_DRI_CFLAGS)