diff options
Diffstat (limited to 'meta/conf/bitbake.conf')
-rw-r--r-- | meta/conf/bitbake.conf | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 68700e9e7c..30bb35c2af 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -492,7 +492,7 @@ HOSTTOOLS += " \ | |||
492 | HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" | 492 | HOSTTOOLS += "${@'ip ping ps scp ssh stty' if (bb.utils.contains_any('IMAGE_CLASSES', 'testimage testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testimage.bbclass", "testsdk.bbclass"])) else ''}" |
493 | 493 | ||
494 | # Link to these if present | 494 | # Link to these if present |
495 | HOSTTOOLS_NONFATAL += "aws ccache gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" | 495 | HOSTTOOLS_NONFATAL += "aws gcc-ar gpg ld.bfd ld.gold nc pigz sftp socat ssh sudo" |
496 | 496 | ||
497 | # Temporary add few more detected in bitbake world | 497 | # Temporary add few more detected in bitbake world |
498 | HOSTTOOLS_NONFATAL += "join nl size yes zcat" | 498 | HOSTTOOLS_NONFATAL += "join nl size yes zcat" |
@@ -504,10 +504,6 @@ HOSTTOOLS_NONFATAL += "bzr" | |||
504 | HOSTTOOLS_NONFATAL += "scp" | 504 | HOSTTOOLS_NONFATAL += "scp" |
505 | 505 | ||
506 | CCACHE ??= "" | 506 | CCACHE ??= "" |
507 | # ccache < 3.1.10 will create CCACHE_DIR on startup even if disabled, and | ||
508 | # autogen sets HOME=/dev/null so in certain situations builds can fail. | ||
509 | # Explicitly export CCACHE_DIR until we can assume ccache >3.1.10 on the host. | ||
510 | export CCACHE_DIR ??= "${@os.getenv('HOME')}/.ccache" | ||
511 | 507 | ||
512 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" | 508 | TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}" |
513 | 509 | ||