Commit d2cd6210 authored by Chia-I Wu's avatar Chia-I Wu

android: pass -std=c99 by default

Several modules expect a C99 compiler already.  It is also the default for
Makefile build.
parent 4d3d6f76
......@@ -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
......
......@@ -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)
......
......@@ -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
......
......@@ -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 \
......
......@@ -30,8 +30,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(C_SOURCES)
LOCAL_CFLAGS := -std=c99
LOCAL_C_INCLUDES :=
LOCAL_MODULE := libmesa_pipe_r600
......
......@@ -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)
......@@ -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
......
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment