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

Commit 0fda1eaa authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Replace $(shell) in recipe with subshell."

parents 8db170d9 a6a9ab07

core/definitions.mk

+4 −4
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ define transform-cpp-to-o 
@mkdir -p $(dir $@)

$(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \

	$(addprefix -I , $(PRIVATE_C_INCLUDES)) \

	$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \

	$$(cat $(PRIVATE_IMPORT_INCLUDES)) \

	$(addprefix -isystem ,\

	    $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

	        $(filter-out $(PRIVATE_C_INCLUDES), \
@@ -1184,7 +1184,7 @@ define transform-c-or-s-to-o-no-deps 
@mkdir -p $(dir $@)

$(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \

	$(addprefix -I , $(PRIVATE_C_INCLUDES)) \

	$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \

	$$(cat $(PRIVATE_IMPORT_INCLUDES)) \

	$(addprefix -isystem ,\

	    $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

	        $(filter-out $(PRIVATE_C_INCLUDES), \
@@ -1259,7 +1259,7 @@ define transform-host-cpp-to-o 
@mkdir -p $(dir $@)

$(hide) $(RELATIVE_PWD) $(PRIVATE_CXX) \

	$(addprefix -I , $(PRIVATE_C_INCLUDES)) \

	$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \

	$$(cat $(PRIVATE_IMPORT_INCLUDES)) \

	$(addprefix -isystem ,\

	    $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

	        $(filter-out $(PRIVATE_C_INCLUDES), \
@@ -1289,7 +1289,7 @@ define transform-host-c-or-s-to-o-no-deps 
@mkdir -p $(dir $@)

$(hide) $(RELATIVE_PWD) $(PRIVATE_CC) \

	$(addprefix -I , $(PRIVATE_C_INCLUDES)) \

	$(shell cat $(PRIVATE_IMPORT_INCLUDES)) \

	$$(cat $(PRIVATE_IMPORT_INCLUDES)) \

	$(addprefix -isystem ,\

	    $(if $(PRIVATE_NO_DEFAULT_COMPILER_FLAGS),, \

	        $(filter-out $(PRIVATE_C_INCLUDES), \