Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7095e91 authored by Evgeniy Stepanov's avatar Evgeniy Stepanov
Browse files

Include Clang headers from ".../include" directory. 

Do it with -isystem instead of -I.

Change-Id: I70fd55772e59a35f0b5a56816d61120f4921f4a4
parent 2109487a

core/binary.mk

+6 −4
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ my_compiler_dependencies := 
ifeq ($(strip $(LOCAL_CLANG)),true)

  LOCAL_CFLAGS += $(CLANG_CONFIG_EXTRA_CFLAGS)

  LOCAL_LDFLAGS += $(CLANG_CONFIG_EXTRA_LDFLAGS)

  LOCAL_C_INCLUDES += $(CLANG_CONFIG_EXTRA_C_INCLUDES)

  my_compiler_dependencies := $(CLANG) $(CLANG_CXX)

endif
@@ -157,18 +156,21 @@ endif 


ifdef LOCAL_NDK_VERSION

my_target_project_includes :=

my_target_c_inclues := $(my_ndk_stl_include_path) $(my_ndk_version_root)/usr/include

my_target_c_includes := $(my_ndk_stl_include_path) $(my_ndk_version_root)/usr/include

# TODO: more reliable way to remove platform stuff.

my_target_global_cflags := $(filter-out -include -I system/%, $(my_target_global_cflags))

my_target_global_cppflags := $(filter-out -include -I system/%, $(TARGET_GLOBAL_CPPFLAGS))

else

my_target_project_includes := $(TARGET_PROJECT_INCLUDES)

my_target_c_inclues := $(TARGET_C_INCLUDES)

my_target_c_includes := $(TARGET_C_INCLUDES)

my_target_global_cflags := $(my_target_global_cflags)

my_target_global_cppflags := $(TARGET_GLOBAL_CPPFLAGS)

ifeq ($(strip $(LOCAL_CLANG)),true)

  my_target_c_includes += $(CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES)

endif

endif

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_PROJECT_INCLUDES := $(my_target_project_includes)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_C_INCLUDES := $(my_target_c_inclues)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_C_INCLUDES := $(my_target_c_includes)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CFLAGS := $(my_target_global_cflags)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(my_target_global_cppflags)

core/llvm_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ ifeq ($(TARGET_ARCH),x86) 
    -mbionic

endif



CLANG_CONFIG_EXTRA_C_INCLUDES := external/clang/lib/Headers

CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES := external/clang/lib/include



# remove unknown flags to define CLANG_FLAGS

TARGET_GLOBAL_CLANG_FLAGS += $(filter-out $(CLANG_CONFIG_UNKNOWN_CFLAGS),$(TARGET_GLOBAL_CFLAGS))