StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add "WITH_SYNTAX_CHECK=1 make ...""

Browse Source
This commit is contained in:
Andrew Hsieh
2013-09-04 21:57:50 +00:00
committed by Gerrit Code Review
parent 62cd88d0d1 6cea59a4b9
commit a62334edaf
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/binary.mk
View File

@@ -170,6 +170,16 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(TARGET_GLOBAL
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_DEFAULT_COMPILER_FLAGS := \ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_NO_DEFAULT_COMPILER_FLAGS := \
$(strip $(LOCAL_NO_DEFAULT_COMPILER_FLAGS)) $(strip $(LOCAL_NO_DEFAULT_COMPILER_FLAGS))
ifeq ($(strip $(WITH_SYNTAX_CHECK)),)
LOCAL_NO_SYNTAX_CHECK := true
endif
ifneq ($(strip $(LOCAL_IS_HOST_MODULE)),)
my_syntax_arch := host
else
my_syntax_arch := $(TARGET_ARCH)
endif
ifeq ($(strip $(LOCAL_CC)),) ifeq ($(strip $(LOCAL_CC)),)
ifeq ($(strip $(LOCAL_CLANG)),true) ifeq ($(strip $(LOCAL_CLANG)),true)
LOCAL_CC := $(CLANG) LOCAL_CC := $(CLANG)
@@ -177,6 +187,9 @@ ifeq ($(strip $(LOCAL_CC)),)
LOCAL_CC := $($(my_prefix)CC) LOCAL_CC := $($(my_prefix)CC)
endif endif
endif endif
ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)
LOCAL_CC := $(SYNTAX_TOOLS_PREFIX)/ccc-syntax $(my_syntax_arch) "$(LOCAL_CC)"
endif
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(LOCAL_CC) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CC := $(LOCAL_CC)
ifeq ($(strip $(LOCAL_CXX)),) ifeq ($(strip $(LOCAL_CXX)),)
@@ -186,6 +199,9 @@ ifeq ($(strip $(LOCAL_CXX)),)
LOCAL_CXX := $($(my_prefix)CXX) LOCAL_CXX := $($(my_prefix)CXX)
endif endif
endif endif
ifneq ($(LOCAL_NO_SYNTAX_CHECK),true)
LOCAL_CXX := $(SYNTAX_TOOLS_PREFIX)/cxx-syntax $(my_syntax_arch) "$(LOCAL_CXX)"
endif
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CXX := $(LOCAL_CXX) $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_CXX := $(LOCAL_CXX)
# TODO: support a mix of standard extensions so that this isn't necessary # TODO: support a mix of standard extensions so that this isn't necessary

1
core/clear_vars.mk
View File

@@ -137,6 +137,7 @@ LOCAL_ADDITIONAL_CERTIFICATES:=
LOCAL_PREBUILT_MODULE_FILE:= LOCAL_PREBUILT_MODULE_FILE:=
LOCAL_POST_INSTALL_CMD:= LOCAL_POST_INSTALL_CMD:=
LOCAL_DIST_BUNDLED_BINARIES:= LOCAL_DIST_BUNDLED_BINARIES:=
LOCAL_NO_SYNTAX_CHECK:=
# Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
# iterate over thousands of entries every time. # iterate over thousands of entries every time.

9
core/config.mk
View File

@@ -247,6 +247,15 @@ TARGET_TOOLCHAIN_ROOT := $(patsubst %/, %, $(dir $(TARGET_TOOLCHAIN_ROOT)))
TARGET_TOOLCHAIN_ROOT := $(wildcard $(TARGET_TOOLCHAIN_ROOT)) TARGET_TOOLCHAIN_ROOT := $(wildcard $(TARGET_TOOLCHAIN_ROOT))
endif endif
# Disable WITH_SYNTAX_CHECK if tool can't be found
SYNTAX_TOOLS_PREFIX := prebuilts/clang/$(HOST_PREBUILT_TAG)/host/3.3/bin
ifneq ($(strip $(WITH_SYNTAX_CHECK)),)
ifeq ($(wildcard $(SYNTAX_TOOLS_PREFIX)/ccc-syntax),)
$(warning *** Disable WITH_SYNTAX_CHECK because $(SYNTAX_TOOLS_PREFIX)/ccc-syntax does not exist)
WITH_SYNTAX_CHECK :=
endif
endif
# Pick a Java compiler. # Pick a Java compiler.
include $(BUILD_SYSTEM)/combo/javac.mk include $(BUILD_SYSTEM)/combo/javac.mk