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

Merge "Replace in recipe with subshell."

Browse Source 
am: 0fda1ea

* commit '0fda1eaa43c8d6018e757671a2c92d635e681d93':
  Replace $(shell) in recipe with subshell.

Change-Id: Ia9f2f0a55a2c44cece5af4311383f26d686d456f
This commit is contained in:
Ying Wang
2016-03-31 16:52:57 +00:00
committed by android-build-merger
parent cb259241a2 0fda1eaa43
commit d4d59fd87c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/definitions.mk
View File

@@ -1152,7 +1152,7 @@ define transform-cpp-to-o
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \ $(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \ $$(cat $(PRIVATE_IMPORT_INCLUDES)) \
$(addprefix -isystem ,\ $(addprefix -isystem ,\
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(filter-out $(PRIVATE_C_INCLUDES), \ $(filter-out $(PRIVATE_C_INCLUDES), \
@@ -1184,7 +1184,7 @@ define transform-c-or-s-to-o-no-deps
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \ $(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \ $$(cat $(PRIVATE_IMPORT_INCLUDES)) \
$(addprefix -isystem ,\ $(addprefix -isystem ,\
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(filter-out $(PRIVATE_C_INCLUDES), \ $(filter-out $(PRIVATE_C_INCLUDES), \
@@ -1259,7 +1259,7 @@ define transform-host-cpp-to-o
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \ $(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \ $$(cat $(PRIVATE_IMPORT_INCLUDES)) \
$(addprefix -isystem ,\ $(addprefix -isystem ,\
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(filter-out $(PRIVATE_C_INCLUDES), \ $(filter-out $(PRIVATE_C_INCLUDES), \
@@ -1289,7 +1289,7 @@ define transform-host-c-or-s-to-o-no-deps
@mkdir -p $(dir $@) @mkdir -p $(dir $@)
$(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \ $(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \
$(addprefix -I , $(PRIVATE_C_INCLUDES)) \ $(addprefix -I , $(PRIVATE_C_INCLUDES)) \
$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \ $$(cat $(PRIVATE_IMPORT_INCLUDES)) \
$(addprefix -isystem ,\ $(addprefix -isystem ,\
$(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \ $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \
$(filter-out $(PRIVATE_C_INCLUDES), \ $(filter-out $(PRIVATE_C_INCLUDES), \