diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 6de17d1bb5..cf303c237a 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -127,7 +127,11 @@ def setup_hosttools_dir(dest, toolsvar, d, fatal=True): # clean up dead symlink if os.path.islink(desttool): os.unlink(desttool) - srctool = bb.utils.which(path, tool, executable=True) + + # Prefer gnu-prefixed binaries, if available + srctool = (bb.utils.which(path, "gnu" + tool, executable=True) or + bb.utils.which(path, tool, executable=True)) + # gcc/g++ may link to ccache on some hosts, e.g., # /usr/local/bin/ccache/gcc -> /usr/bin/ccache, then which(gcc) # would return /usr/local/bin/ccache/gcc, but what we need is