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

Commit 85f3b219 authored by Andrew Boie's avatar Andrew Boie
Browse files

definitions.mk: Don't use GCC '@' parameter 



This parameter (which causes GCC to pull additional command line
parameters out of a file) is incompatible with ccache.

- With ccache 2.x, ccache will ignore this parameters, and potentially
compute invalid command line hashes since it is not reading the
parameter file

- With ccache 3.x, ccache will refuse to cache the files and error
with 'Unsupported compiler option'.

We still use the parameter file, but Make expands it instead.

Change-Id: I070c3877cbe2d058e1cf4754bac535e7f3498861
Signed-off-by: default avatarAndrew Boie <andrew.p.boie@intel.com>
parent c11b5efa

core/definitions.mk

+4 −4
Original line number Original line Diff line number Diff line
@@ -883,7 +883,7 @@ define transform-cpp-to-o 
@echo "target $(PRIVATE_ARM_MODE) C++: $(PRIVATE_MODULE) <= $<"

@echo "target $(PRIVATE_ARM_MODE) C++: $(PRIVATE_MODULE) <= $<"

$(hide) $(PRIVATE_CXX) \

$(hide) $(PRIVATE_CXX) \

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

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

	@$(PRIVATE_IMPORT_INCLUDES) \

	$(shell 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), \
@@ -913,7 +913,7 @@ define transform-c-or-s-to-o-no-deps 
@mkdir -p $(dir $@)

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_CC) \

$(hide) $(PRIVATE_CC) \

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

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

	@$(PRIVATE_IMPORT_INCLUDES) \

	$(shell 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), \
@@ -975,7 +975,7 @@ define transform-host-cpp-to-o 
@echo "host C++: $(PRIVATE_MODULE) <= $<"

@echo "host C++: $(PRIVATE_MODULE) <= $<"

$(hide) $(PRIVATE_CXX) \

$(hide) $(PRIVATE_CXX) \

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

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

	@$(PRIVATE_IMPORT_INCLUDES) \

	$(shell 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), \
@@ -1003,7 +1003,7 @@ define transform-host-c-or-s-to-o-no-deps 
@mkdir -p $(dir $@)

@mkdir -p $(dir $@)

$(hide) $(PRIVATE_CC) \

$(hide) $(PRIVATE_CC) \

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

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

	@$(PRIVATE_IMPORT_INCLUDES) \

	$(shell 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), \