diff options
| author | Vesa Jääskeläinen <vesa.jaaskelainen@vaisala.com> | 2020-12-27 10:28:54 +0200 |
|---|---|---|
| committer | Jérôme Forissier <jerome@forissier.org> | 2020-12-27 14:30:16 +0100 |
| commit | 6754fa79f282a2f33394bed975de2ce97cde180f (patch) | |
| tree | 8a9cfb3c9d679f4cabdbe50656527849ffb2c21a | |
| parent | 90c47fe29e97003d7e9aebe063276155b5748ba4 (diff) | |
mk/compile.mk: Fix handling of '+' in path for generated include guards
When building with bitbake with gitpkgv class git revision details have
'+' as delimeter.
Version details appears in path and this causes following warnings during
the OP-TEE OS build:
In file included from core/arch/arm/kernel/entry_a64.S:11:
/build/.../optee-os/devel+gitrAUTOINC+e97c83bd6f-r0/build.zcu102/core/include/generated/asm-defines.h:1:123: warning: extra tokens at end of #ifndef directive
1 | #ifndef _build_..._optee_os_devel+gitrAUTOINC+e97c83bd6f_r0_build_zcu102_core_include_generated_asm_defines_h
| ^
/build/.../optee-os/devel+gitrAUTOINC+e97c83bd6f-r0/build.zcu102/core/include/generated/asm-defines.h:2:9: warning: missing whitespace after the macro name
2 | #define _build_..._optee_os_devel+gitrAUTOINC+e97c83bd6f_r0_build_zcu102_core_include_generated_asm_defines_h
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Reviewed-by: Jerome Forissier <jerome@forissier.org>
Signed-off-by: Vesa Jääskeläinen <vesa.jaaskelainen@vaisala.com>
| -rw-r--r-- | mk/compile.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mk/compile.mk b/mk/compile.mk index 66605037..f2f56af3 100644 --- a/mk/compile.mk +++ b/mk/compile.mk @@ -223,7 +223,7 @@ $3: $1 $(conf-file) FORCE $$(comp-cmd-file-$3) ;\ ) -guard-$2 := $$(subst -,_,$$(subst .,_,$$(subst /,_,$2))) +guard-$2 := $$(subst -,_,$$(subst .,_,$$(subst /,_,$$(subst +,_,$2)))) $(2): $(3) $(q)set -e; \ |