Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit e1df3fa364a5f0d8b4c589c29c0f304d69a0121c

Authored by Matt Weber
Committed by Tom Rini
1 parent f88b6facb8
Exists in smarc_8mq_lf_v2020.04 and in 11 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

include/version.h: workaround sysroot inc order 

On some systems the host system or even the cross sysroot can
contain a version.h.  This leads to the wrong file being picked
up and a PLAIN_VERSION undefined error.

This workaround symlinks the version.h into the tool folder to
allow reordering of search folders.

Fixes
http://autobuild.buildroot.net/results/770/7702d5df36a6532aafdbe6e9e62709bbfa058b54/build-end.log
http://autobuild.buildroot.net/results/e34/e3401027d2fb3ce565ca9e2456a427afd3610a87/build-end.log
... additional can be found with these queries ...
http://autobuild.buildroot.net/?reason=uboot-tools-2018.03
http://autobuild.buildroot.net/?reason=uboot-tools-2018.05

Upstream: pending

Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>

Showing 2 changed files with 3 additions and 1 deletions Side-by-side Diff

... ... @@ -9,7 +9,8 @@
9 9 override HOSTCC = $(CC)
10 10  
11 11 # Compile for a hosted environment on the target
12   -HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
  12 +HOST_EXTRACFLAGS = -I$(srctree)/tools \
  13 + $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
13 14 -idirafter $(srctree)/tools/env \
14 15 -DUSE_HOSTCC \
15 16 -DTEXT_BASE=$(TEXT_BASE)
  1 +../include/version.h