From c860dcbe63b0e393c95bfb0131238f91aaac11d3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 7 Oct 2021 12:44:18 +0200 Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize' names The outcome is that processed names no longer match our custom rust target definitions, and the build fails. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin --- build/moz.configure/init.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -647,24 +647,7 @@ def help_host_target(help, host, target) def config_sub(shell, triplet): config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub") - # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so - # munge those before and after calling config.sub. - suffix = None - munging = { - "-windows-msvc": "-mingw32", - "-windows-gnu": "-mingw32", - } - for check_suffix, replacement in munging.items(): - if triplet.endswith(check_suffix): - suffix = check_suffix - triplet = triplet[: -len(suffix)] + replacement - break - result = check_cmd_output(shell, config_sub, triplet).strip() - if suffix: - assert result.endswith(replacement) - result = result[: -len(replacement)] + suffix - return result - + return triplet @depends("--host", shell) @checking("for host system type", lambda h: h.alias)