diff options
-rw-r--r-- | core/definitions.mk | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 1a7cf4bbe6..326f085e2b 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -873,11 +873,17 @@ define transform-cpp-to-o @echo "target $(PRIVATE_ARM_MODE) C++: $(PRIVATE_MODULE) <= $<" $(hide) $(PRIVATE_CXX) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \ - $(addprefix -isystem ,\ + $(addprefix -I ,\ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(filter-out $(PRIVATE_C_INCLUDES), \ + $(filter-out bionic/% $(PRIVATE_C_INCLUDES), \ $(PRIVATE_TARGET_PROJECT_INCLUDES) \ $(PRIVATE_TARGET_C_INCLUDES)))) \ + $(addprefix -isystem ,\ + $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(filter bionic/%, \ + $(filter-out $(PRIVATE_C_INCLUDES), \ + $(PRIVATE_TARGET_PROJECT_INCLUDES) \ + $(PRIVATE_TARGET_C_INCLUDES))))) \ -c \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(PRIVATE_TARGET_GLOBAL_CFLAGS) \ @@ -902,11 +908,17 @@ define transform-c-or-s-to-o-no-deps @mkdir -p $(dir $@) $(hide) $(PRIVATE_CC) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \ - $(addprefix -isystem ,\ + $(addprefix -I ,\ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(filter-out $(PRIVATE_C_INCLUDES), \ + $(filter-out bionic/% $(PRIVATE_C_INCLUDES), \ $(PRIVATE_TARGET_PROJECT_INCLUDES) \ $(PRIVATE_TARGET_C_INCLUDES)))) \ + $(addprefix -isystem ,\ + $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(filter bionic/%, \ + $(filter-out $(PRIVATE_C_INCLUDES), \ + $(PRIVATE_TARGET_PROJECT_INCLUDES) \ + $(PRIVATE_TARGET_C_INCLUDES))))) \ -c \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(PRIVATE_TARGET_GLOBAL_CFLAGS) \ @@ -963,11 +975,17 @@ define transform-host-cpp-to-o @echo "host C++: $(PRIVATE_MODULE) <= $<" $(hide) $(PRIVATE_CXX) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \ - $(addprefix -isystem ,\ + $(addprefix -I ,\ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(filter-out $(PRIVATE_C_INCLUDES), \ + $(filter-out bionic/% $(PRIVATE_C_INCLUDES), \ $(HOST_PROJECT_INCLUDES) \ $(HOST_C_INCLUDES)))) \ + $(addprefix -isystem ,\ + $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(filter bionic/%, \ + $(filter-out $(PRIVATE_C_INCLUDES), \ + $(HOST_PROJECT_INCLUDES) \ + $(HOST_C_INCLUDES))))) \ -c \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(HOST_GLOBAL_CFLAGS) \ @@ -990,11 +1008,17 @@ define transform-host-c-or-s-to-o-no-deps @mkdir -p $(dir $@) $(hide) $(PRIVATE_CC) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \ - $(addprefix -isystem ,\ + $(addprefix -I ,\ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ - $(filter-out $(PRIVATE_C_INCLUDES), \ + $(filter-out bionic/% $(PRIVATE_C_INCLUDES), \ $(HOST_PROJECT_INCLUDES) \ $(HOST_C_INCLUDES)))) \ + $(addprefix -isystem ,\ + $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ + $(filter bionic/%, \ + $(filter-out $(PRIVATE_C_INCLUDES), \ + $(HOST_PROJECT_INCLUDES) \ + $(HOST_C_INCLUDES))))) \ -c \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(HOST_GLOBAL_CFLAGS) \ |