From 8d6285927b508de8cb16d5dac0578bc15b6109a2 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Wed, 25 Sep 2019 16:47:33 +0200 Subject: [PATCH] tools.conf: fix check for arm_64 Before arm matched first resulting in the wrong tool-chain binaries being used. --- repos/base/etc/tools.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/base/etc/tools.conf b/repos/base/etc/tools.conf index 961cf07b0d..f0182612f7 100644 --- a/repos/base/etc/tools.conf +++ b/repos/base/etc/tools.conf @@ -24,15 +24,15 @@ endif ifeq ($(filter-out $(SPECS),x86_64),) CROSS_DEV_PREFIX ?= /usr/local/genode/tool/19.05/bin/genode-x86- endif +ifeq ($(filter-out $(SPECS),arm_64),) +CROSS_DEV_PREFIX ?= /usr/local/genode/tool/19.05/bin/genode-aarch64- +endif ifeq ($(filter-out $(SPECS),arm),) CROSS_DEV_PREFIX ?= /usr/local/genode/tool/19.05/bin/genode-arm- endif ifeq ($(filter-out $(SPECS),riscv),) CROSS_DEV_PREFIX ?= /usr/local/genode/tool/19.05/bin/genode-riscv- endif -ifeq ($(filter-out $(SPECS),arm_64),) -CROSS_DEV_PREFIX ?= /usr/local/genode/tool/19.05/bin/genode-aarch64- -endif # # We use libsupc++ from g++ version 3 because