diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-11-15 19:58:21 +0059 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-11-15 19:58:21 +0059 |
| commit | 8b612e092100fd3426dc4eb00405e4ea0446e6f8 (patch) | |
| tree | f935ae319847cf363a1183e91bb3b031c7c033f4 | |
| parent | d65ea59e6dbb44f13567372d66358c7218d88339 (diff) | |
| download | build-8b612e092100fd3426dc4eb00405e4ea0446e6f8.tar.gz | |
build: Fix up -isystem usage
-isystem should never be used for C++ headers - use it only for
bionic headers, use -I for the rest
First step towards getting it to build with current gcc versions
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
| -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) \ |