diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 13:26:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 13:26:40 -0700 |
| commit | 1870b7f4f26f5c1d32e767dad7a05c69e1679a3d (patch) | |
| tree | 687d00593969371273899c1d7afa5ad4d9983706 /core/definitions.mk | |
| parent | 7de61d1471cd8938ade62ae439cad11ea141cf40 (diff) | |
| parent | a4814370724634c0ee0bf35bc68f382f0df93668 (diff) | |
| download | build-1870b7f4f26f5c1d32e767dad7a05c69e1679a3d.zip build-1870b7f4f26f5c1d32e767dad7a05c69e1679a3d.tar.gz build-1870b7f4f26f5c1d32e767dad7a05c69e1679a3d.tar.bz2 | |
am a4814370: am 4733cfd2: Merge "definitions.mk: Don\'t use GCC \'@\' parameter"
* commit 'a4814370724634c0ee0bf35bc68f382f0df93668':
definitions.mk: Don't use GCC '@' parameter
Diffstat (limited to 'core/definitions.mk')
| -rw-r--r-- | core/definitions.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/definitions.mk b/core/definitions.mk index 2565e6e..bf8ce58 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -883,7 +883,7 @@ define transform-cpp-to-o @echo "target $(PRIVATE_ARM_MODE) C++: $(PRIVATE_MODULE) <= $<" $(hide) $(PRIVATE_CXX) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \ - @$(PRIVATE_IMPORT_INCLUDES) \ + $(shell cat $(PRIVATE_IMPORT_INCLUDES)) \ $(addprefix -isystem ,\ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(filter-out $(PRIVATE_C_INCLUDES), \ @@ -913,7 +913,7 @@ define transform-c-or-s-to-o-no-deps @mkdir -p $(dir $@) $(hide) $(PRIVATE_CC) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \ - @$(PRIVATE_IMPORT_INCLUDES) \ + $(shell cat $(PRIVATE_IMPORT_INCLUDES)) \ $(addprefix -isystem ,\ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(filter-out $(PRIVATE_C_INCLUDES), \ @@ -975,7 +975,7 @@ define transform-host-cpp-to-o @echo "host C++: $(PRIVATE_MODULE) <= $<" $(hide) $(PRIVATE_CXX) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \ - @$(PRIVATE_IMPORT_INCLUDES) \ + $(shell cat $(PRIVATE_IMPORT_INCLUDES)) \ $(addprefix -isystem ,\ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(filter-out $(PRIVATE_C_INCLUDES), \ @@ -1003,7 +1003,7 @@ define transform-host-c-or-s-to-o-no-deps @mkdir -p $(dir $@) $(hide) $(PRIVATE_CC) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \ - @$(PRIVATE_IMPORT_INCLUDES) \ + $(shell cat $(PRIVATE_IMPORT_INCLUDES)) \ $(addprefix -isystem ,\ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(filter-out $(PRIVATE_C_INCLUDES), \ |